Fix GLAPIENTRYP for OS X.

Fix build problems related to incorrect define of GLAPIENTRYP on OS X.
Reported by bushing on IRC.

diff --git a/src/mesa/glapi/gl_table.py b/src/mesa/glapi/gl_table.py
index 52b4be1d2b55f291590f10c605a3e8269c3dbd33..69f7bd7c7b5c3a7b7ebfd3436d0747cd81a302e0 100644 (file)
--- a/src/mesa/glapi/gl_table.py
+++ b/src/mesa/glapi/gl_table.py
@@ -49,7 +49,11 @@ class PrintGlTable(gl_XML.gl_print_base):
 
        def printRealHeader(self):
                print '#ifndef GLAPIENTRYP'
-               print '#define GLAPIENTRYP'
+               print '# ifndef GLAPIENTRY'
+               print '#  define GLAPIENTRY'
+               print '# endif'
+               print ''
+               print '# define GLAPIENTRYP GLAPIENTRY *'
                print '#endif'
                print ''
                print 'typedef void (*_glapi_proc)(void); /* generic function pointer */'

diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 55548adcd3b2a967ac0aaaff6d4bc6d441634620..4af0c2d43b8829dff16ff70130ae56ea7b5cfe01 100644 (file)
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -30,7 +30,11 @@
 #  define _GLAPI_TABLE_H_
 
 #ifndef GLAPIENTRYP
-#define GLAPIENTRYP
+# ifndef GLAPIENTRY
+#  define GLAPIENTRY
+# endif
+
+# define GLAPIENTRYP GLAPIENTRY *
 #endif
 
 typedef void (*_glapi_proc)(void); /* generic function pointer */