aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-15 23:22:23 +0100
committerMarc Haesen <marc@hc-consult.be>2011-12-15 23:22:23 +0100
commit84b2a38812705928a9ce3de36fac422def8bc67e (patch)
tree97329d703b07be826105b1fd11b65184d272ab0c /mesalib/src/mapi/glapi
parent9800c8726697243c532072c77c635aac37dbcb13 (diff)
downloadvcxsrv-84b2a38812705928a9ce3de36fac422def8bc67e.tar.gz
vcxsrv-84b2a38812705928a9ce3de36fac422def8bc67e.tar.bz2
vcxsrv-84b2a38812705928a9ce3de36fac422def8bc67e.zip
Synchronised files
Diffstat (limited to 'mesalib/src/mapi/glapi')
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_table.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py
index 608ace41a..67ee5e813 100644
--- a/mesalib/src/mapi/glapi/gen/gl_table.py
+++ b/mesalib/src/mapi/glapi/gen/gl_table.py
@@ -92,9 +92,11 @@ class PrintRemapTable(gl_XML.gl_print_base):
* can SET_FuncName, are used to get and set the dispatch pointer for the
* named function in the specified dispatch table.
*/
+
/* GLXEXT is defined when building the GLX extension in the xserver.
*/
#if !defined(GLXEXT)
+#include "main/mfeatures.h"
#endif
"""
return
@@ -185,11 +187,11 @@ class PrintRemapTable(gl_XML.gl_print_base):
print 'typedef %s (GLAPIENTRYP _glptr_%s)(%s);' % (f.return_type, f.name, arg_string)
print '#define CALL_%s(disp, parameters) \\' % (f.name)
print ' (* GET_%s(disp)) parameters' % (f.name)
- print 'static inline _glptr_%s GET_%s(struct _glapi_table *disp) {' % (f.name, f.name)
+ print 'static INLINE _glptr_%s GET_%s(struct _glapi_table *disp) {' % (f.name, f.name)
print ' return (_glptr_%s) (GET_by_offset(disp, _gloffset_%s));' % (f.name, f.name)
print '}'
print
- print 'static inline void SET_%s(struct _glapi_table *disp, %s (GLAPIENTRYP fn)(%s)) {' % (f.name, f.return_type, arg_string)
+ print 'static INLINE void SET_%s(struct _glapi_table *disp, %s (GLAPIENTRYP fn)(%s)) {' % (f.name, f.return_type, arg_string)
print ' SET_by_offset(disp, _gloffset_%s, fn);' % (f.name)
print '}'
print