replaced ## with CONCAT macro

diff --git a/src/mesa/glapi/glx86asm.py b/src/mesa/glapi/glx86asm.py
index 2e546c41c2117b54b01f8eaff17e6b70f7ad83af..4ccf1f5a1dc9e3d4d70e9709ef875cd90d9a4754 100644 (file)
--- a/src/mesa/glapi/glx86asm.py
+++ b/src/mesa/glapi/glx86asm.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-# $Id: glx86asm.py,v 1.1 2000/05/11 23:14:57 brianp Exp $
+# $Id: glx86asm.py,v 1.2 2000/09/06 17:33:40 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.3
+# Version:  3.4
 # 
 # Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
 # 
@@ -48,9 +48,9 @@ def PrintHead():
        print '#ifndef __WIN32__'
        print ''
        print '#if defined(USE_MGL_NAMESPACE)'
-       print '#define GL_PREFIX(n) GLNAME(mgl ## n)'
+       print '#define GL_PREFIX(n) GLNAME(CONCAT(mgl,n))'
        print '#else'
-       print '#define GL_PREFIX(n) GLNAME(gl ## n)'
+       print '#define GL_PREFIX(n) GLNAME(CONCAT(gl,n))'
        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 3afd50e0af6c4bbf9fd2af04f51195bc4012c472..43b62e762ed76b07ca2818438c715c256f5dbe31 100644 (file)
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -5,9 +5,9 @@
 #ifndef __WIN32__
 
 #if defined(USE_MGL_NAMESPACE)
-#define GL_PREFIX(n) GLNAME(mgl ## n)
+#define GL_PREFIX(n) GLNAME(CONCAT(mgl,n))
 #else
-#define GL_PREFIX(n) GLNAME(gl ## n)
+#define GL_PREFIX(n) GLNAME(CONCAT(gl,n))
 #endif
 
 #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))