summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Fogal <tfogal@alumni.unh.edu>2011-10-19 14:41:35 -0600
committerTom Fogal <tfogal@alumni.unh.edu>2011-10-24 10:22:52 -0600
commitcbb2b4149ba26ee26f73f53e9b2aa960d9e5862c (patch)
treecd9dafe3b3d4e3a5138fffe6438c12c6b672e02d
parent2717b8f034db16cf551e167aa5ce3a9be3bf730b (diff)
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@vmware.com>
-rw-r--r--include/GL/gl.h2
-rw-r--r--src/mesa/main/compiler.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index 998a83ab1f1..e65e1bc8a8f 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 89d6cda913c..921e3022288 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