summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-11-25 23:20:07 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-11-25 23:20:07 +0000
commitb653aaede5abf39f91f9d1152bb411572950184f (patch)
tree83196ed43504c12cabd1bf7593f92f79b5b9801b
parent7a293a996224aa4fcb20bee70609f863a534d0de (diff)
minor APIENTRY clean-ups
-rw-r--r--include/GL/gl.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index d9c6e30eb2..da617cff71 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -64,11 +64,7 @@
#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
# define GLAPI extern
# define GLAPIENTRY __stdcall
-#else
-/* non-Windows compilation */
-# define GLAPI extern
-# define GLAPIENTRY
-#endif /* WIN32 / CYGWIN bracket */
+#endif /* WIN32 && !CYGWIN */
#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
# define PRAGMA_EXPORT_SUPPORTED 1
@@ -95,10 +91,22 @@
#pragma import on
#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
#ifndef APIENTRY
#define APIENTRY GLAPIENTRY
#endif
+
+/* "P" suffix for when function returns a pointer */
+#ifndef APIENTRYP
#define APIENTRYP APIENTRY *
+#endif
#ifndef GLAPIENTRYP
#define GLAPIENTRYP GLAPIENTRY *
@@ -844,7 +852,7 @@ GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode );
GLAPI GLenum GLAPIENTRY glGetError( void );
-GLAPI const GLubyte* GLAPIENTRY glGetString( GLenum name );
+GLAPI const GLubyte GLAPIENTRYP glGetString( GLenum name );
GLAPI void GLAPIENTRY glFinish( void );