Fix build with new gcc by reducing pasting abuse in macros.

Reported by:	bento

1 files changed, 43 insertions, 0 deletions

diff --git a/graphics/glide3/files/patch-h5-distate.c b/graphics/glide3/files/patch-h5-distate.c
new file mode 100644
index 000000000000..33306ffaa37e
--- /dev/null
+++ b/graphics/glide3/files/patch-h5-distate.c
@@ -0,0 +1,43 @@
+--- h5/glide3/src/distate.c.orig	Sun Sep 28 22:36:52 2003
++++ h5/glide3/src/distate.c	Sun Sep 28 22:37:05 2003
+@@ -350,31 +350,31 @@
+  */
+ 
+ #define STOREARG_TMU(function, tmu, arg) \
+-gc->state.stateArgs.##function##Args.arg[tmu] = arg
++gc->state.stateArgs.function##Args.arg[tmu] = arg
+ 
+ #define LOADARG_TMU(function, tmu, arg) \
+-gc->state.stateArgs.##function##Args.arg[tmu]
++gc->state.stateArgs.function##Args.arg[tmu]
+ 
+ #define STOREARG(function, arg) \
+-gc->state.stateArgs.##function##Args.arg = arg
++gc->state.stateArgs.function##Args.arg = arg
+ 
+ #define LOADARG(function, arg) \
+-gc->state.stateArgs.##function##Args.arg
++gc->state.stateArgs.function##Args.arg
+ 
+ #define NOTVALID(regset) \
+-(gc->state.invalid & ##regset##BIT)
++(gc->state.invalid & regset##BIT)
+ 
+ #define NOTVALID_TMU(tmu, regset) \
+-(gc->state.tmuInvalid[tmu] & ##regset##BIT)
++(gc->state.tmuInvalid[tmu] & regset##BIT)
+ 
+ #define SETVALID(regset) \
+-(gc->state.invalid &= ~(##regset##BIT))
++(gc->state.invalid &= ~(regset##BIT))
+ 
+ #define ENABLEMODE(mode) \
+-gc->state.grEnableArgs.##mode## = GR_MODE_ENABLE;
++gc->state.grEnableArgs.mode = GR_MODE_ENABLE;
+ 
+ #define DISABLEMODE(mode) \
+-gc->state.grEnableArgs.##mode## = GR_MODE_DISABLE;
++gc->state.grEnableArgs.mode = GR_MODE_DISABLE;
+ 
+ /*-------------------------------------------------------------------
+   Function: grAlphaBlendFunction