Another attempt at fixing name mangling and gl__unused413().

diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h
index 8d3306b9fb133e3a032a4512a6c6f1cfaf18844b..873be540ab1eba3c21e2de053fb9536c43b3f8c2 100644 (file)
--- a/include/GL/gl_mangle.h
+++ b/include/GL/gl_mangle.h
@@ -30,6 +30,7 @@
 /* Internal symbols which may collide with other OpenGL implementations. */
 #define __glCoreCreateContext __mglCoreCreateContext
 #define __glCoreNopDispatch   __mglCoreNopDispatch
+#define gl__unused413 MANGLE(__unused413)
 
 /*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */
 

diff --git a/src/mesa/glapi/gl_apitemp.py b/src/mesa/glapi/gl_apitemp.py
index 8070c4fccf2e4f88a7d66a3812060fe124b043b6..b8b32ac362459c7dd9d25c8c626327c40e5926de 100644 (file)
--- a/src/mesa/glapi/gl_apitemp.py
+++ b/src/mesa/glapi/gl_apitemp.py
@@ -129,11 +129,7 @@ class PrintGlOffsets(gl_XML.FilterGLAPISpecBase):
 #error RETURN_DISPATCH must be defined
 #endif
 
-#ifdef USE_MGL_NAMESPACE
-GLAPI void GLAPIENTRY mgl__unused413(void);  /* silence warning */
-#else
 GLAPI void GLAPIENTRY gl__unused413(void);  /* silence warning */
-#endif
 """
                return
 

diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 9108826840e19e2f2375ddff874a923935d3a3cb..579494ce817a63621f3554be4909b74f52f0d2e8 100644 (file)
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -69,11 +69,7 @@
 #error RETURN_DISPATCH must be defined
 #endif
 
-#ifdef USE_MGL_NAMESPACE
-GLAPI void GLAPIENTRY mgl__unused413(void);  /* silence warning */
-#else
 GLAPI void GLAPIENTRY gl__unused413(void);  /* silence warning */
-#endif
 
 KEYWORD1 void KEYWORD2 NAME(NewList)(GLuint list, GLenum mode)
 {