From: Balint Reczey <balint@balintreczey.hu>
Date: Sat, 2 Mar 2013 22:27:40 +0000 (-0000)
Subject: Revert "Make Solaris Studio hide internal shared library symbols by default"
X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=1eb5e1d73970baa2bf0dd603e5da02c9b6a2e617;ds=sidebyside

Revert "Make Solaris Studio hide internal shared library symbols by default"

This reverts commit r48020.

svn path=/trunk/; revision=48022
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cdce2ad81..d00a66be27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,13 +218,8 @@ check_c_compiler_flag(-fvisibility=hidden FVHIDDEN)
 if((FVHIDDEN))
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
 else() # TODO add alternate compiler flags for hiding symbols
-	check_c_compiler_flag(-xldscope=hidden FVHIDDEN)
-	if((FVHIDDEN))
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
-	else()
-		message(WARNING "Hiding shared library symbols is not supported by the compiler."
+	message(WARNING "Hiding shared library symbols is not supported by the compiler."
 		" All shared library symbols will be exported.")
-	endif()
 endif()
 
 if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
diff --git a/configure.ac b/configure.ac
index 344737308f..2d8d9f2465 100644
--- a/configure.ac
+++ b/configure.ac
@@ -521,12 +521,10 @@ fi
 
 CFLAGS_before_fvhidden=$CFLAGS
 AC_WIRESHARK_GCC_CFLAGS_CHECK(-fvisibility=hidden)
-if test "x$CLFAGS" = "x$CFLAGS_before_fvhidden" ; then
-	AC_WIRESHARK_GCC_CFLAGS_CHECK(-xldscope=hidden)
+if test "x$CLFAGS" = "x$CFLAGS_before_fvhidden"
+then
 	# TODO add other ways of hiding symbols
-	if test "x$CLFAGS" = "x$CFLAGS_before_fvhidden" ; then
-		AC_MSG_WARN(Compiler will export all symbols from shared libraries)
-	fi
+	AC_MSG_WARN(Compiler will export all symbols from shared libraries)
 fi
 
 AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-needed])
diff --git a/ws_symbol_export.h b/ws_symbol_export.h
index d85efba188..ac9b973053 100644
--- a/ws_symbol_export.h
+++ b/ws_symbol_export.h
@@ -24,7 +24,7 @@
 #define SYMBOL_EXPORT_H
 
 /* Originally copied from GCC Wiki at http://gcc.gnu.org/wiki/Visibility */
-#if defined _WIN32 || defined __CYGWIN__ || defined __SUNPRO_C || defined__SUNPRO_CC
+#if defined _WIN32 || defined __CYGWIN__
   #ifdef WS_BUILD_DLL
     #ifdef __GNUC__
 #define WS_DLL_PUBLIC __attribute__ ((dllexport))