diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2003-09-29 06:04:41 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2003-09-29 06:04:41 +0000 |
| commit | 072682a526c685b7622612d1ab4453a97b57feea (patch) | |
| tree | 5b8a9f052e41d4c9a408f6c8897b4e10008e62b1 /graphics/glide3/files/patch-h3-fxglide_h | |
| parent | Update to version 0.2.0 (diff) | |
Fix build with new gcc by reducing pasting abuse in macros.
Reported by: bento
Notes
Notes:
svn path=/head/; revision=89747
Diffstat (limited to 'graphics/glide3/files/patch-h3-fxglide_h')
| -rw-r--r-- | graphics/glide3/files/patch-h3-fxglide_h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/graphics/glide3/files/patch-h3-fxglide_h b/graphics/glide3/files/patch-h3-fxglide_h index 1a55276f044f..57c406fef8a5 100644 --- a/graphics/glide3/files/patch-h3-fxglide_h +++ b/graphics/glide3/files/patch-h3-fxglide_h @@ -1,6 +1,23 @@ -diff -ru ../Glide3.orig/h3/glide3/src/fxglide.h ./h3/glide3/src/fxglide.h ---- ../Glide3.orig/h3/glide3/src/fxglide.h Thu May 31 12:05:52 2001 -+++ ./h3/glide3/src/fxglide.h Sun Jan 13 15:35:42 2002 +--- h3/glide3/src/fxglide.h.orig Thu May 31 12:05:52 2001 ++++ h3/glide3/src/fxglide.h Sun Sep 28 22:41:02 2003 +@@ -1526,7 +1526,7 @@ + + #ifdef GLIDE3 + #define GR_STATE_ENTRY(name, type, args) \ +- type _##name## args ++ type _##name args + #else + #define GR_STATE_ENTRY(name, type, args) \ + GR_ENTRY(name, type, args) +@@ -1845,7 +1845,7 @@ + #define CUR_TRI_PROC(__checkValidP, __cullP) \ + (*gc->archDispatchProcs.coorModeTriVector)[__checkValidP][__cullP] + #define INVALIDATE(regset) {\ +- gc->state.invalid |= ##regset##BIT; \ ++ gc->state.invalid |= regset##BIT; \ + gc->triSetupProc = CUR_TRI_PROC(FXTRUE, (gc->state.cull_mode != GR_CULL_DISABLE)); \ + } + @@ -2133,7 +2133,11 @@ #if defined(GLIDE_SANITY_ASSERT) #define GR_ASSERT(exp) ((void)((!(exp)) ? (_grAssert(#exp, __FILE__, __LINE__),0) : 0xFFFFFFFF)) |