diff options
| author | Brian Paul <[email protected]> | 2003-12-04 03:19:46 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-12-04 03:19:46 +0000 |
| commit | b305028464f02947c0cce0476af0e35f4ed1fafa (patch) | |
| tree | 6623fb86dea2eb572743c161055e37a1d43c995d /src/mesa/x86/assyntax.h | |
| parent | 03e29a5f77c13b7b888bd8443cb2752850e47d6a (diff) | |
Port over changes from XFree86/Mesa 5.0.2, mostly to silence compiler warnings.
Diffstat (limited to 'src/mesa/x86/assyntax.h')
| -rw-r--r-- | src/mesa/x86/assyntax.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h index ebe9c57460d..13f980d57da 100644 --- a/src/mesa/x86/assyntax.h +++ b/src/mesa/x86/assyntax.h @@ -78,9 +78,11 @@ #endif #if (defined(__STDC__) && !defined(UNIXCPP)) || (defined (sun) && defined (i386) && defined (SVR4) && defined (__STDC__) && !defined (__GNUC__)) -#define CONCAT(x, y) x ## y +#define CONCAT(x, y) x ## y +#define CONCAT3(x, y, z) x ## y ## z #else -#define CONCAT(x, y) x/**/y +#define CONCAT(x, y) x/**/y +#define CONCAT3(x, y, z) x/**/y/**/z #endif #ifdef ACK_ASSEMBLER @@ -862,7 +864,8 @@ #define P_XMM6 xmm6 #define P_XMM7 xmm7 -#define CONCAT(x, y) x ## y +#define CONCAT(x, y) x ## y +#define CONCAT3(x, y, z) x ## y ## z #if defined(NASM_ASSEMBLER) @@ -1689,8 +1692,10 @@ SECTION _DATA public align=16 class=DATA use32 flat /* Added by BrianP for FreeBSD (per David Dawes) */ #if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) && !defined(__bsdi__) #define LLBL(a) CONCAT(.L,a) +#define LLBL2(a,b) CONCAT3(.L,a,b) #else #define LLBL(a) a +#define LLBL2(a,b) CONCAT(a,b) #endif /* Segment overrides */ |