diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-14 08:32:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-14 08:32:15 +0100 |
| commit | 53d28537755790ee4625dc16f560cad5aa93f56b (patch) | |
| tree | 1c93b584de655b109ec12adc448fc6c6a4e98ee5 /mesalib/src/mapi/glapi/gen/glX_proto_size.py | |
| parent | b9c84e8e3433d8804b99ec82065ec1e920469d87 (diff) | |
| download | vcxsrv-53d28537755790ee4625dc16f560cad5aa93f56b.tar.gz vcxsrv-53d28537755790ee4625dc16f560cad5aa93f56b.tar.bz2 vcxsrv-53d28537755790ee4625dc16f560cad5aa93f56b.zip | |
git update mesa 14 dec 2011
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/glX_proto_size.py')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/glX_proto_size.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_size.py b/mesalib/src/mapi/glapi/gen/glX_proto_size.py index f16ea4c3b..b31d1c650 100644 --- a/mesalib/src/mapi/glapi/gen/glX_proto_size.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_size.py @@ -225,7 +225,7 @@ class glx_enum_function: def Print(self, name): - print 'INTERNAL PURE FASTCALL GLint' + print '_X_INTERNAL PURE FASTCALL GLint' print '__gl%s_size( GLenum e )' % (name) print '{' @@ -313,6 +313,7 @@ class PrintGlxSizeStubs_common(gl_XML.gl_print_base): class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common): def printRealHeader(self): print '' + print '#include <X11/Xfuncproto.h>' print '#include <GL/gl.h>' if self.emit_get: print '#include "indirect_size_get.h"' @@ -326,20 +327,18 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common): print '' self.printFastcall() print '' - self.printVisibility( "INTERNAL", "internal" ) - print '' print '' print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)' print '# undef HAVE_ALIAS' print '#endif' print '#ifdef HAVE_ALIAS' print '# define ALIAS2(from,to) \\' - print ' INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' + print ' _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' print ' __attribute__ ((alias( # to )));' print '# define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )' print '#else' print '# define ALIAS(from,to) \\' - print ' INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' + print ' _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' print ' { return __gl ## to ## _size( e ); }' print '#endif' print '' @@ -379,12 +378,12 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common): * \\author Ian Romanick <idr@us.ibm.com> */ """ + print '#include <X11/Xfuncproto.h>' + print '' self.printPure(); print '' self.printFastcall(); print '' - self.printVisibility( "INTERNAL", "internal" ); - print '' def printBody(self, api): @@ -394,7 +393,7 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common): continue if (ef.is_set() and self.emit_set) or (not ef.is_set() and self.emit_get): - print 'extern INTERNAL PURE FASTCALL GLint __gl%s_size(GLenum);' % (func.name) + print 'extern _X_INTERNAL PURE FASTCALL GLint __gl%s_size(GLenum);' % (func.name) class PrintGlxReqSize_common(gl_XML.gl_print_base): @@ -418,7 +417,7 @@ class PrintGlxReqSize_h(PrintGlxReqSize_common): def printRealHeader(self): - self.printVisibility("HIDDEN", "hidden") + print '#include <X11/Xfuncproto.h>' print '' self.printPure() print '' @@ -427,7 +426,7 @@ class PrintGlxReqSize_h(PrintGlxReqSize_common): def printBody(self, api): for func in api.functionIterateGlx(): if not func.ignore and func.has_variable_size_request(): - print 'extern PURE HIDDEN int __glX%sReqSize(const GLbyte *pc, Bool swap);' % (func.name) + print 'extern PURE _X_HIDDEN int __glX%sReqSize(const GLbyte *pc, Bool swap);' % (func.name) class PrintGlxReqSize_c(PrintGlxReqSize_common): |