From: Ian Romanick <idr@us.ibm.com>
Date: Fri, 23 Feb 2007 23:15:50 +0000 (-0800)
Subject: Fix GLAPIENTRYP for OS X.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3f8c5969ffea5485aa119f4d766cdfee7d4aadeb;p=mesa.git

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 52b4be1d2b5..69f7bd7c7b5 100644
--- 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 55548adcd3b..4af0c2d43b8 100644
--- 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 */