diff options
| author | Brian <[email protected]> | 2007-02-24 18:15:45 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-02-24 18:15:45 -0700 |
| commit | d9fb113e0571dba9ac29576015cb5816c53ac467 (patch) | |
| tree | 12b8fd7438f168eaffaf0eec9de5281210040db6 | |
| parent | 53170942e37ccdf58e06a2cfbfeef6c0ec086ee6 (diff) | |
| parent | 3f8c5969ffea5485aa119f4d766cdfee7d4aadeb (diff) | |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa
| -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 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 */ |