summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTed Jump <tjump@users.sourceforge.net>1999-09-19 02:03:18 +0000
committerTed Jump <tjump@users.sourceforge.net>1999-09-19 02:03:18 +0000
commit725ec81ae80e024df4a5490405dbfbc598533e6e (patch)
treeac0115bd0729dea1f6ffde983f85e266b13e851e /include
parent1bf9dfaf5dea61e3d33a69b0a549be54ef6d74df (diff)
More Win32 build compliance fixups
Diffstat (limited to 'include')
-rw-r--r--include/GL/gl.h12
-rw-r--r--include/GL/glu.h13
2 files changed, 9 insertions, 16 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index 02b1239389..8c00484d58 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.7 1999/09/18 01:06:52 brianp Exp $ */
+/* $Id: gl.h,v 1.8 1999/09/19 02:03:18 tjump Exp $ */
/*
* Mesa 3-D graphics library
@@ -2181,17 +2181,11 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void );
* If you want to try it out, #define GL_EXT_get_proc_address before
* #include <GL/gl.h>
*/
+#define GL_EXT_get_proc_address 1
#ifdef GL_EXT_get_proc_address
-#ifdef __WIN32__
- typedef (void GLAPIENTRY *glProcAddress)();
- glProcAddress GLAPIENTRY glGetProcAddressEXT(const GLubyte *procName);
-#else
- /* everything but Windows */
- GLAPI void GLAPIENTRY (*glGetProcAddressEXT(const GLubyte *procName))();
-#endif
+GLAPI void (GLAPIENTRY *glGetProcAddressEXT(const GLubyte *procName))();
#endif
-
#if defined(__BEOS__) || defined(__QUICKDRAW__)
#pragma export off
#endif
diff --git a/include/GL/glu.h b/include/GL/glu.h
index 01d630ef8b..6861a17190 100644
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -1,4 +1,4 @@
-/* $Id: glu.h,v 1.8 1999/09/17 12:21:36 brianp Exp $ */
+/* $Id: glu.h,v 1.9 1999/09/19 02:03:18 tjump Exp $ */
/*
* Mesa 3-D graphics library
@@ -23,6 +23,9 @@
/*
* $Log: glu.h,v $
+ * Revision 1.9 1999/09/19 02:03:18 tjump
+ * More Win32 build compliance fixups
+ *
* Revision 1.8 1999/09/17 12:21:36 brianp
* glGetProcAddressEXT changes to accomodate Win32 and non-Win32
*
@@ -511,15 +514,11 @@ GLUAPI const GLubyte* GLAPIENTRY gluGetString( GLenum name );
* which uses this extension yet! It may change!
*/
#define GLU_EXT_get_proc_address 1
-#ifdef __WIN32__
- typedef (void (GLAPIENTRY *gluProcAddress))();
- gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName);
-#else
- GLUAPI void GLAPIENTRY (*gluGetProcAddressEXT(const GLubyte *procName))();
+#ifdef GLU_EXT_get_proc_address
+GLUAPI void (GLAPIENTRY *glGetProcAddressEXT(const GLubyte *procName))();
#endif
-
#if defined(__BEOS__) || defined(__QUICKDRAW__)
#pragma export off
#endif