diff options
| author | brianp <brianp> | 2000-04-20 16:36:36 +0000 |
|---|---|---|
| committer | brianp <brianp> | 2000-04-20 16:36:36 +0000 |
| commit | 899f86f398ead01bcfb72824830966e1d5c65eb2 (patch) | |
| tree | 09c32adb0a14256b72ff98baa00611a6ef175330 /xc/extras/Mesa/src/X86/assyntax.h | |
| parent | 1ed162fe52c6627afbfce2f33c41b6ee05a764f9 (diff) | |
Merged glxmisc-1-0-0glxmisc-1-0-0-20000420-merge
Diffstat (limited to 'xc/extras/Mesa/src/X86/assyntax.h')
| -rw-r--r-- | xc/extras/Mesa/src/X86/assyntax.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xc/extras/Mesa/src/X86/assyntax.h b/xc/extras/Mesa/src/X86/assyntax.h index 43164d907..2a1034870 100644 --- a/xc/extras/Mesa/src/X86/assyntax.h +++ b/xc/extras/Mesa/src/X86/assyntax.h @@ -243,10 +243,7 @@ #endif /* ACK_ASSEMBLER */ -#if (defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) \ - || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__) \ - || defined(__FreeBSD__) && __FreeBSD__ >= 3) \ - || (defined(__NetBSD__) && defined(__ELF__)) +#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) #define GLNAME(a) a #else #define GLNAME(a) CONCAT(_,a) @@ -851,6 +848,8 @@ #define P_XMM6 xmm6 #define P_XMM7 xmm7 +#define CONCAT(x, y) x ## y + #if defined(NASM_ASSEMBLER) #define ST(n) st ## n |