Mesa (master): Only use gcc visibility support with gcc4+.

Thomas Fogal tfogal at kemper.freedesktop.org
Mon Oct 24 09:24:02 PDT 2011


Module: Mesa
Branch: master
Commit: cbb2b4149ba26ee26f73f53e9b2aa960d9e5862c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbb2b4149ba26ee26f73f53e9b2aa960d9e5862c

Author: Tom Fogal <tfogal at alumni.unh.edu>
Date:   Wed Oct 19 14:41:35 2011 -0600

Only use gcc visibility support with gcc4+.

I had a colleague hitting issues compiling with an old gcc3.2
system.  These patches got them through.

NOTE: This is a candidate for the 7.11 branch.

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 include/GL/gl.h          |    2 +-
 src/mesa/main/compiler.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/GL/gl.h b/include/GL/gl.h
index 998a83a..e65e1bc 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -67,7 +67,7 @@
 #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
 #  define GLAPI extern
 #  define GLAPIENTRY __stdcall
-#elif defined(__GNUC__)	|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#elif (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
 #  define GLAPI __attribute__((visibility("default")))
 #  define GLAPIENTRY
 #endif /* WIN32 && !CYGWIN */
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 89d6cda..921e302 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -150,7 +150,7 @@ extern "C" {
  * inline a static function that we later use in an alias. - ajax
  */
 #ifndef PUBLIC
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#  if (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
 #    define PUBLIC __attribute__((visibility("default")))
 #    define USED __attribute__((used))
 #  else



More information about the mesa-commit mailing list