From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 9 Sep 2004 18:13:35 +0000 (+0000)
Subject: Another attempt at fixing name mangling and gl__unused413().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d86d1483ac7da934e935372722999164bfcf6ef7;p=mesa.git

Another attempt at fixing name mangling and gl__unused413().
---

diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h
index 8d3306b9fb1..873be540ab1 100644
--- 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 8070c4fccf2..b8b32ac3624 100644
--- 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 9108826840e..579494ce817 100644
--- 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)
 {