summaryrefslogtreecommitdiff
blob: a185d8e10c7dfc91de60fa1455a29e5bfed252f8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
--- tenebrae_0/glquake.h	2004-12-25 00:28:28.707288592 -0500
+++ tenebrae_0/glquake.h	2004-12-25 00:27:35.000000000 -0500
@@ -34,6 +34,7 @@
 #else
 #include <GL/gl.h>
 #include <GL/glu.h>
+#include <GL/glext.h>
 #endif /* __APPLE__ ||�MACOSX */
 
 /* use the correct dynamic function address binder */  
@@ -420,8 +421,10 @@
 void GL_Bind (int texnum);
 
 #ifndef _WIN32
+#ifndef APIENTRY
 #define APIENTRY /* */
 #endif
+#endif
 
 #if !defined (__APPLE__) && !defined (MACOSX)
 
@@ -1134,8 +1137,10 @@
 // <AWE> There are some diffs with the function parameters. wgl stuff not present with MacOS X. -DC- and SDL 
 #if defined (__APPLE__) || defined (MACOSX) || defined(SDL) || defined (__glx__)
 
+#ifndef GL_APPLE_vertex_array_range
 typedef void (APIENTRY * PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, const GLvoid *pointer);
 typedef void (APIENTRY * PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei size, const GLvoid *pointer);
+#endif
 
 extern PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC qglFlushVertexArrayRangeAPPLE;
 extern PFNGLVERTEXARRAYRANGEAPPLEPROC qglVertexArrayRangeAPPLE;