Status: applied

diff -ruN -x Makefile.in -x configure build-tree.orig/glide2x/cvg/glide/src/cpudetect.c build-tree/glide2x/cvg/glide/src/cpudetect.c
--- build-tree.orig/glide2x/cvg/glide/src/cpudetect.c	1999-12-07 22:49:08.000000000 +0100
+++ build-tree/glide2x/cvg/glide/src/cpudetect.c	2003-05-18 19:08:02.000000000 +0200
@@ -20,6 +20,7 @@
 
 #include <sys/utsname.h>
 #include <stdio.h>
+#include <string.h>
 
 int _cpu_detect_asm() {
   struct utsname name;
diff -ruN -x Makefile.in -x configure build-tree.orig/glide2x/cvg/glide/src/fxglide.h build-tree/glide2x/cvg/glide/src/fxglide.h
--- build-tree.orig/glide2x/cvg/glide/src/fxglide.h	1999-12-07 22:49:09.000000000 +0100
+++ build-tree/glide2x/cvg/glide/src/fxglide.h	2003-05-18 19:06:25.000000000 +0200
@@ -2225,7 +2225,7 @@
 #define REG_GROUP_SETF_CLAMP(__regBase, __regAddr, __val) \
 do { \
   const FxU32 fpClampVal = FP_FLOAT_CLAMP(__val); \
-  REG_GROUP_ASSERT(__regAddr, fpClampVal, FXTRUE); \  
+  REG_GROUP_ASSERT(__regAddr, fpClampVal, FXTRUE); \
   SET(((FxU32*)(__regBase))[offsetof(SstRegs, __regAddr) >> 2], fpClampVal); \
   GR_INC_SIZE(sizeof(FxU32)); \
 } while(0)
diff -ruN -x Makefile.in -x configure build-tree.orig/glide2x/h3/glide/src/fxglide.h build-tree/glide2x/h3/glide/src/fxglide.h
--- build-tree.orig/glide2x/h3/glide/src/fxglide.h	1999-12-07 22:49:26.000000000 +0100
+++ build-tree/glide2x/h3/glide/src/fxglide.h	2003-05-18 19:10:27.000000000 +0200
@@ -2004,7 +2004,7 @@
                                      __stwbrx( *((FxU32*)&temp), (void*)&(d), 0 ); \
                                    }
 #      define SET_LINEAR(d, s)     SET((d), (s))
-#      define SET_LINEAR_16(d, s)  SET((d), ((((FxU32)(s)) >> 16UL) | \ 
+#      define SET_LINEAR_16(d, s)  SET((d), ((((FxU32)(s)) >> 16UL) | \
                                            (((FxU32)(s)) << 16UL)))
 #      define SET_LINEAR_8(d, s)   ((d) = (s))
 #    else /* !defined(__MWERKS__) && POWERPC */
@@ -3008,7 +3008,7 @@
 #define REG_GROUP_SETF_CLAMP(__regBase, __regAddr, __val) \
 do { \
   const FxU32 fpClampVal = FP_FLOAT_CLAMP(__val); \
-  REG_GROUP_ASSERT(__regAddr, fpClampVal, FXTRUE); \  
+  REG_GROUP_ASSERT(__regAddr, fpClampVal, FXTRUE); \
   SET(((FxU32*)(__regBase))[offsetof(SstRegs, __regAddr) >> 2], fpClampVal); \
   GR_INC_SIZE(sizeof(FxU32)); \
 } while(0)
diff -ruN -x Makefile.in -x configure build-tree.orig/glide2x/cvg/glide/oem/oeminit.h build-tree/glide2x/cvg/glide/oem/oeminit.h
--- build-tree.orig/glide2x/cvg/glide/oem/oeminit.h	1999-12-07 22:49:07.000000000 +0100
+++ build-tree/glide2x/cvg/glide/oem/oeminit.h	2003-05-19 14:48:14.000000000 +0200
@@ -89,5 +89,5 @@
 FX_EXPORT FxU32 FX_CSTYLE fxoemRestoreVideo(OemInitInfo *oem);
 FX_EXPORT FxU32 FX_CSTYLE fxoemControl(FxU32 mode);
 
-#endif __OEMINIT_H__
+#endif /* __OEMINIT_H__ */
 
diff -ruN -x Makefile.in -x configure build-tree.orig/glide2x/h3/minihwc/fxhwc.h build-tree/glide2x/h3/minihwc/fxhwc.h
--- build-tree.orig/glide2x/h3/minihwc/fxhwc.h	2000-10-03 20:29:57.000000000 +0200
+++ build-tree/glide2x/h3/minihwc/fxhwc.h	2003-05-19 15:00:10.000000000 +0200
@@ -41,8 +41,8 @@
 **  I/O Macros
 */
 #warning Here!
-#define HWC_IO_LOAD(regInfo, reg, val)
-GDBG_INFO(120, "%s:  Storing 0x%x to IO Register %s\n", 
+#define HWC_IO_LOAD(regInfo, reg, val) \
+GDBG_INFO(120, "%s:  Storing 0x%x to IO Register %s\n", \
 ((SstIORegs *) regInfo.ioMemBase)->
 
 
diff -ruN -x Makefile.in -x configure build-tree.orig/glide2x/h3/glide/src/xdraw2.S build-tree/glide2x/h3/glide/src/xdraw2.S
--- build-tree.orig/glide2x/h3/glide/src/xdraw2.S	1999-12-07 22:49:30.000000000 +0100
+++ build-tree/glide2x/h3/glide/src/xdraw2.S	2003-06-11 07:36:37.000000000 +0200
@@ -125,10 +125,12 @@
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
 #undef cull
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+
+#undef LOCAL
 
 END_PROC_TYPE(cull):
 .size PROC_TYPE(cull),END_PROC_TYPE(cull)-PROC_TYPE(cull)
@@ -147,10 +149,12 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+
+#undef LOCAL
 
 END_PROC_TYPE(cull_rgb):
 .size PROC_TYPE(cull_rgb),END_PROC_TYPE(cull_rgb)-PROC_TYPE(cull_rgb)
@@ -168,10 +172,10 @@
 #define GLIDE_PACK_ALPHA 1
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
 
 END_PROC_TYPE(cull_argb):
 .size PROC_TYPE(cull_argb),END_PROC_TYPE(cull_argb)-PROC_TYPE(cull_argb)
@@ -190,10 +194,12 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+
+#undef LOCAL
 
 END_PROC_TYPE(Default):
 .size PROC_TYPE(Default),END_PROC_TYPE(Default)-PROC_TYPE(Default)
@@ -212,10 +218,12 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+
+#undef LOCAL
 
 END_PROC_TYPE(rgb):
 .size PROC_TYPE(rgb),END_PROC_TYPE(rgb)-PROC_TYPE(rgb)
@@ -233,10 +241,12 @@
 #define GLIDE_PACK_ALPHA 1
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+
+#undef LOCAL
 
 END_PROC_TYPE(argb):
 .size PROC_TYPE(argb),END_PROC_TYPE(argb)-PROC_TYPE(argb)
