Another attempt at fixing name mangling and gl__unused413().

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 */
 

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
 

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)
 {