diff options
author | Brian Paul <[email protected]> | 2000-09-06 17:33:40 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2000-09-06 17:33:40 +0000 |
commit | 37cfb3b5c27e1965dc089e37065750e4845b2d49 (patch) | |
tree | 2d457b3d371d11de8742686e61349f1186913fde | |
parent | f96ce6a707979cbece10cd42f8b03a25d26cac65 (diff) |
replaced ## with CONCAT macro
-rw-r--r-- | src/mesa/glapi/glx86asm.py | 8 | ||||
-rw-r--r-- | src/mesa/x86/glapi_x86.S | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/glapi/glx86asm.py b/src/mesa/glapi/glx86asm.py index 2e546c41c21..4ccf1f5a1dc 100644 --- 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 3afd50e0af6..43b62e762ed 100644 --- 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)) |