summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAdam Jackson <ajax@freedesktop.org>2005-02-08 05:46:53 +0000
committerAdam Jackson <ajax@freedesktop.org>2005-02-08 05:46:53 +0000
commitd084982240bafba0169c4a6cacf02d45d6cfd8c1 (patch)
tree691f990d4581a5367599bc44718d12303b27da87 /include
parent4885a9eb207655ac23b64274034e1d51d2c8e6ce (diff)
Bug #2477: Make GLU/GLw/glut build properly even with -fvisibility=hidden.
Diffstat (limited to 'include')
-rw-r--r--include/GL/gl.h3
-rw-r--r--include/GL/glut.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index f910c3221a..1426df481c 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -62,6 +62,9 @@
#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
# define GLAPI extern
# define GLAPIENTRY __stdcall
+#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+# define GLAPI __attribute__((visibility("default")))
+# define GLAPIENTRY
#endif /* WIN32 && !CYGWIN */
#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
diff --git a/include/GL/glut.h b/include/GL/glut.h
index c1b78aa4e5..2e5be8a77c 100644
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -193,7 +193,7 @@ WGLAPI int GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
#else /* _WIN32 not defined */
/* Define GLUTAPIENTRY and GLUTCALLBACK to nothing if we aren't on Win32. */
-# define GLUTAPIENTRY
+# define GLUTAPIENTRY GLAPI
# define GLUTAPIENTRYV
# define GLUT_APIENTRY_DEFINED
# define GLUTCALLBACK