summaryrefslogtreecommitdiffstats
path: root/src/mesa/x86
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-04-02 16:18:20 +0000
committerBrian Paul <[email protected]>2002-04-02 16:18:20 +0000
commitf9e75c31e8c22828ca9829a1a32226f6569cc5f2 (patch)
tree1d1b68e09b09a7e1f71a19d97734030d3beace90 /src/mesa/x86
parent17b7cc4caeeb8f3daaf417d417e7e3a9a5d639d1 (diff)
DJGPP updates
Diffstat (limited to 'src/mesa/x86')
-rw-r--r--src/mesa/x86/assyntax.h4
-rw-r--r--src/mesa/x86/glapi_x86.S2
2 files changed, 3 insertions, 3 deletions
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