summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-08-25 15:10:51 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-08-25 15:10:51 +0000
commit5920b722b7fb59c340b82ea279033c13a2a01508 (patch)
tree2db3945475334e529618df45544de6592a53997e /src
parent86e001b78cb46c1d5a216dd50b3d7fe32db23575 (diff)
Fix mgl name mangling (patch 1014800)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/glapi/gl_x86_asm.py14
-rw-r--r--src/mesa/x86/glapi_x86.S14
2 files changed, 20 insertions, 8 deletions
diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py
index 159925838c..e79a5b8b70 100644
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -62,11 +62,17 @@ class PrintGenericStubs(gl_XML.FilterGLAPISpecBase):
print '#ifndef __WIN32__'
print ''
print '#if defined(STDCALL_API)'
- print '#define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n2))'
- print '#elif defined(USE_MGL_NAMESPACE)'
- print '#define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n))'
+ print '# if defined(USE_MGL_NAMESPACE)'
+ print '# define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n2))'
+ print '# else'
+ print '# define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n2))'
+ print '# endif'
print '#else'
- print '#define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n))'
+ print '# if defined(USE_MGL_NAMESPACE)'
+ print '# define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n))'
+ print '# else'
+ print '# define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n))'
+ print '# endif'
print '#endif'
print ''
print '#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))'
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 6727e708c1..0d4d19db16 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -32,11 +32,17 @@
#ifndef __WIN32__
#if defined(STDCALL_API)
-#define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n2))
-#elif defined(USE_MGL_NAMESPACE)
-#define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n))
+# if defined(USE_MGL_NAMESPACE)
+# define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n2))
+# else
+# define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n2))
+# endif
#else
-#define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n))
+# if defined(USE_MGL_NAMESPACE)
+# define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n))
+# else
+# define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n))
+# endif
#endif
#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))