diff options
| -rw-r--r-- | src/mesa/glapi/glx86asm.py | 4 | ||||
| -rw-r--r-- | src/mesa/x86/assyntax.h | 4 | ||||
| -rw-r--r-- | src/mesa/x86/glapi_x86.S | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/glapi/glx86asm.py b/src/mesa/glapi/glx86asm.py index 236673096a6..3e61fc547eb 100644 --- a/src/mesa/glapi/glx86asm.py +++ b/src/mesa/glapi/glx86asm.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# $Id: glx86asm.py,v 1.4 2001/11/18 22:42:57 brianp Exp $ +# $Id: glx86asm.py,v 1.5 2002/04/02 16:18:20 brianp Exp $ # Mesa 3-D graphics library # Version: 4.1 @@ -52,7 +52,7 @@ def PrintHead(): print '' print '#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))' print '' - print '#ifdef GNU_ASSEMBLER' + print '#if defined(GNU_ASSEMBLER) && !defined(DJGPP)' print '#define GLOBL_FN(x) GLOBL x ; .type x,@function' print '#else' print '#define GLOBL_FN(x) GLOBL x' diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h index 8acc6d031d9..ad71b747a4d 100644 --- a/src/mesa/x86/assyntax.h +++ b/src/mesa/x86/assyntax.h @@ -1,4 +1,4 @@ -/* $Id: assyntax.h,v 1.18 2002/03/07 21:40:08 brianp Exp $ */ +/* $Id: assyntax.h,v 1.19 2002/04/02 16:18:20 brianp Exp $ */ #ifndef __ASSYNTAX_H__ #define __ASSYNTAX_H__ @@ -254,7 +254,7 @@ #endif /* ACK_ASSEMBLER */ -#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) +#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) && !defined(DJGPP) #define GLNAME(a) a #else #define GLNAME(a) CONCAT(_,a) diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S index 82d72ab8359..f8ed32aa0cd 100644 --- a/src/mesa/x86/glapi_x86.S +++ b/src/mesa/x86/glapi_x86.S @@ -12,7 +12,7 @@ #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) -#ifdef GNU_ASSEMBLER +#if defined(GNU_ASSEMBLER) && !defined(DJGPP) #define GLOBL_FN(x) GLOBL x ; .type x,@function #else #define GLOBL_FN(x) GLOBL x |