glapi/gen: fix out of tree build

[mesa.git] / src / mapi / glapi / gen / glX_proto_recv.py

diff --git a/src/mapi/glapi/gen/glX_proto_recv.py b/src/mapi/glapi/gen/glX_proto_recv.py
index 887f63191dea4c1a46f76f97621e70cd9baba2bd..b577bb6bd63afb3028c615b803df7857b926a493 100644 (file)
--- a/src/mapi/glapi/gen/glX_proto_recv.py
+++ b/src/mapi/glapi/gen/glX_proto_recv.py
@@ -41,7 +41,8 @@ class PrintGlxDispatch_h(gl_XML.gl_print_base):
 
 
        def printRealHeader(self):
-               self.printVisibility( "HIDDEN", "hidden" )
+               print '#  include <X11/Xfuncproto.h>'
+               print ''
                print 'struct __GLXclientStateRec;'
                print ''
                return
@@ -51,16 +52,16 @@ class PrintGlxDispatch_h(gl_XML.gl_print_base):
                for func in api.functionIterateAll():
                        if not func.ignore and not func.vectorequiv:
                                if func.glx_rop:
-                                       print 'extern HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name)
-                                       print 'extern HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name)
+                                       print 'extern _X_HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name)
+                                       print 'extern _X_HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name)
                                elif func.glx_sop or func.glx_vendorpriv:
-                                       print 'extern HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name)
-                                       print 'extern HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name)
+                                       print 'extern _X_HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name)
+                                       print 'extern _X_HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name)
 
                                        if func.glx_sop and func.glx_vendorpriv:
                                                n = func.glx_vendorpriv_names[0]
-                                               print 'extern HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)
-                                               print 'extern HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)
+                                               print 'extern _X_HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)
+                                               print 'extern _X_HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)
 
                return
 
@@ -92,7 +93,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
                print '#include "glapi.h"'
                print '#include "glapitable.h"'
                print '#include "glthread.h"'
-               print '#include "glapidispatch.h"'
+               print '#include "dispatch.h"'
                print ''
                print '#define __GLX_PAD(x)  (((x) + 3) & ~3)'
                print ''
@@ -384,9 +385,9 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
                print '    int error;'
 
                if self.do_swap:
-                   print '    struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);'
+                   print '    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);'
                else:
-                   print '    struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error);'
+                   print '    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);'
 
                print ''
                if name not in f.glx_vendorpriv_names: