[cairo-commit] pixman/src src/cairoint.h

[Carl Worth]

 pixman/src/pixman.h |    2 +-
 src/cairoint.h      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree d02aa5b23eb6243b21697de203db0a5f1b49def9 (from 8236282c5d58320173b17659e488384e710d0ea7)
Author: Gilles Dauphin <dauphin at enst.fr>
Date:   Fri Mar 16 10:35:23 2007 -0700

    Don't use unsupported visibily attribute hidden on Solaris
    
    Thanks to Thomas Klausner for passing the report along.
    This fixes the following bug report:
    
    	hidden attribute does not work with Solaris ld
    	https://bugs.freedesktop.org/show_bug.cgi?id=10227
    
    And as Behdad points out, an even better fix would be to
    move checks for supported visibility attribute to configure.

diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h
index 7f0ef32..9120eb6 100644
--- a/pixman/src/pixman.h
+++ b/pixman/src/pixman.h
@@ -99,7 +99,7 @@ SOFTWARE.
 
 #include "pixman-remap.h"
 
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun__)
 #define pixman_private		__attribute__((__visibility__("hidden")))
 #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
 #define pixman_private		__hidden
diff --git a/src/cairoint.h b/src/cairoint.h
index 0ac5961..74eccfb 100755
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -73,7 +73,7 @@
 
 CAIRO_BEGIN_DECLS
 
-#if __GNUC__ >= 3 && defined(__ELF__)
+#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
 # define slim_hidden_proto(name)	slim_hidden_proto1(name, slim_hidden_int_name(name))
 # define slim_hidden_def(name)		slim_hidden_def1(name, slim_hidden_int_name(name))
 # define slim_hidden_int_name(name) INT_##name
@@ -102,7 +102,7 @@ CAIRO_BEGIN_DECLS
 #endif
 
 /* slim_internal.h */
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
 #define cairo_private		__attribute__((__visibility__("hidden")))
 #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
 #define cairo_private		__hidden