diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-02-23 15:15:50 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-02-23 15:15:50 -0800 |
| commit | 3f8c5969ffea5485aa119f4d766cdfee7d4aadeb (patch) | |
| tree | 950a68b596d5b6628d4e568ae206ea3feb308861 /src | |
| parent | 5e66843733c8123e73cadc1bc5c6111d64abaf25 (diff) | |
Fix GLAPIENTRYP for OS X.
Fix build problems related to incorrect define of GLAPIENTRYP on OS X.
Reported by bushing on IRC.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/glapi/gl_table.py | 6 | ||||
| -rw-r--r-- | src/mesa/glapi/glapitable.h | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/mesa/glapi/gl_table.py b/src/mesa/glapi/gl_table.py index 52b4be1d2b..69f7bd7c7b 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 55548adcd3..4af0c2d43b 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 */ |