mesa: Branch 'master'

[Ian Romanick]

 src/mesa/glapi/gl_table.py  |    6 +++++-
 src/mesa/glapi/glapitable.h |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
diff-tree 3f8c5969ffea5485aa119f4d766cdfee7d4aadeb (from 5e66843733c8123e73cadc1bc5c6111d64abaf25)
Author: Ian Romanick <idr at us.ibm.com>
Date:   Fri Feb 23 15:15:50 2007 -0800

    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 52b4be1..69f7bd7 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 55548ad..4af0c2d 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 */