summaryrefslogtreecommitdiff
path: root/src/mesa/glapi
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-02-24 18:29:57 -0700
committerBrian <brian@yutani.localnet.net>2007-02-24 18:29:57 -0700
commit9d8df479961a6ee21a4848bbcd44f0bd63c0ed44 (patch)
treeaed160f698feec1c30c195ce953e1c1bcdbd0d12 /src/mesa/glapi
parent53bcdedc329807b4d77f0c8b3e23282e204103a7 (diff)
parentd9fb113e0571dba9ac29576015cb5816c53ac467 (diff)
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/glapi')
-rw-r--r--src/mesa/glapi/gl_table.py6
-rw-r--r--src/mesa/glapi/glapitable.h6
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 */