Francois Gouget : include: Don't use the visibility attribute on Solaris.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Mar 7 08:50:37 CST 2016
Module: wine
Branch: master
Commit: 947fd6e6f966770c3b551f9744d5062ef46df4b1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=947fd6e6f966770c3b551f9744d5062ef46df4b1
Author: Francois Gouget <fgouget at free.fr>
Date: Sat Mar 5 10:49:04 2016 +0100
include: Don't use the visibility attribute on Solaris.
It is not supported and mostly ignored but can still break linking with
static libraries.
Signed-off-by: Francois Gouget <fgouget at free.fr>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/winnt.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/winnt.h b/include/winnt.h
index 2309ae3..559a719 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -148,13 +148,13 @@ extern "C" {
# define DECLSPEC_EXPORT __declspec(dllexport)
#elif defined(__MINGW32__)
# define DECLSPEC_EXPORT __attribute__((dllexport))
-#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
+#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) && !defined(__sun)
# define DECLSPEC_EXPORT __attribute__((visibility ("default")))
#else
# define DECLSPEC_EXPORT
#endif
-#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__)
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) || defined(__sun)
# define DECLSPEC_HIDDEN
#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
# define DECLSPEC_HIDDEN __attribute__((visibility ("hidden")))
More information about the wine-cvs
mailing list