summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-04-01 17:09:25 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-04-01 17:09:25 +0000
commitaa5698e8edb92421cdf8e3221bdd7e066f504e7b (patch)
tree3f27d5058f8d4651cd9e6c4dfb60b8d874238fa0
parentcf4c9ada0d9a05b33047a6e1ba160daecd27876b (diff)
DJGPP fixesmesa_4_0_2
-rw-r--r--src/mesa/glapi/glx86asm.py4
-rw-r--r--src/mesa/x86/assyntax.h4
-rw-r--r--src/mesa/x86/glapi_x86.S2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/glapi/glx86asm.py b/src/mesa/glapi/glx86asm.py
index ce93279f5a1..3cd448e06de 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.3 2001/03/28 17:22:11 brianp Exp $
+# $Id: glx86asm.py,v 1.3.2.1 2002/04/01 17:09:25 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.4
@@ -55,7 +55,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 e02826838e5..965e8d05a38 100644
--- a/src/mesa/x86/assyntax.h
+++ b/src/mesa/x86/assyntax.h
@@ -1,4 +1,4 @@
-/* $Id: assyntax.h,v 1.16.2.3 2002/03/07 21:39:09 brianp Exp $ */
+/* $Id: assyntax.h,v 1.16.2.4 2002/04/01 17:09:25 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 25d10124f29..5d1fbc168d2 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