From 5920b722b7fb59c340b82ea279033c13a2a01508 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 25 Aug 2004 15:10:51 +0000 Subject: Fix mgl name mangling (patch 1014800) --- src/mesa/x86/glapi_x86.S | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/mesa/x86') 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)) -- cgit v1.2.3