glapi: fix generator scripts w.r.t. GLX_USE_APPLEGL

Commit 80b280db883edc9550484dba03bd5c124b6a9bf9 changed the .c files
instead of the .py generator scripts.

diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py
index c52b85bfb4f2fe0a93cc9ac3efc4a96d2c03dd3f..e7322820738dba5c9e9b86736becd6c9110c5084 100644 (file)
--- a/src/mapi/glapi/gen/glX_proto_send.py
+++ b/src/mapi/glapi/gen/glX_proto_send.py
@@ -373,7 +373,7 @@ const GLuint __glXDefaultPixelStore[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 1 };
                                print '{'
                                print '    __GLXcontext * const gc = __glXGetCurrentContext();'
                                print ''
-                               print '#ifdef GLX_DIRECT_RENDERING'
+                               print '#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)'
                                print '    if (gc->driContext) {'
                                print '    %sCALL_%s(GET_DISPATCH(), (%s));' % (ret_string, func.name, func.get_called_parameter_string())
                                print '    } else'

diff --git a/src/mapi/glapi/gen/glX_proto_size.py b/src/mapi/glapi/gen/glX_proto_size.py
index 95cb5110cc3cc8d7dd08619883a90ddd33d15432..f16ea4c3b68876e404b9b6c67a1db17681d6a793 100644 (file)
--- a/src/mapi/glapi/gen/glX_proto_size.py
+++ b/src/mapi/glapi/gen/glX_proto_size.py
@@ -329,7 +329,7 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
                self.printVisibility( "INTERNAL", "internal" )
                print ''
                print ''
-               print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)'
+               print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)'
                print '#  undef HAVE_ALIAS'
                print '#endif'
                print '#ifdef HAVE_ALIAS'