1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
--- h5/glide3/src/fxglide.h.orig Thu May 31 12:05:52 2001
+++ h5/glide3/src/fxglide.h Sun Sep 28 22:35:50 2003
@@ -2125,7 +2125,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)
@@ -2636,13 +2636,13 @@
#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)); \
}
#define INVALIDATE_TMU(tmu, regset) {\
INVALIDATE(tmuConfig); \
- gc->state.tmuInvalid[tmu] |= ##regset##BIT; \
+ gc->state.tmuInvalid[tmu] |= regset##BIT; \
}
void
@@ -2992,7 +2992,11 @@
#if defined(GLIDE_SANITY_ASSERT)
#define GR_ASSERT(exp) ((void)((!(exp)) ? (_grAssert(#exp, __FILE__, __LINE__),0) : 0xFFFFFFFF))
#else
-#define GR_ASSERT(exp) ((void)(0 && ((FxU32)(exp))))
+# ifdef __GNUC__
+# define GR_ASSERT(exp) ((void) 0)
+# else
+# define GR_ASSERT(exp) ((void)(0 && ((FxU32)(exp))))
+# endif
#endif
#define INTERNAL_CHECK(__name, __cond, __msg, __fatalP) \
|
