- merged gcc4 patch and more complete no_redefine_macro patch (based on Debian patche...

[packages/Glide_V3-DRI.git] / glide-no_redefine_macro.patch

diff --git a/glide-no_redefine_macro.patch b/glide-no_redefine_macro.patch
index 4cdc0d75b90aa6d8c29d8e2a358efbf50bc8ff5c..4bd3ec4a7b0c77deb6bc37eee28b1e608991fb6e 100644 (file)
--- a/glide-no_redefine_macro.patch
+++ b/glide-no_redefine_macro.patch
@@ -1,16 +1,15 @@
---- glide3x-20010309-orig/h3/glide3/src/xdraw2.inc.S   2006-06-03 00:42:40.000000000 +0000
-+++ glide3x-20010309/h3/glide3/src/xdraw2.inc.S        2006-06-03 13:09:54.000000000 +0000
-@@ -55,7 +55,8 @@
- 
+--- glide3x.orig/h3/glide3/src/xdraw2.inc.S
++++ glide3x/h3/glide3/src/xdraw2.inc.S
+@@ -59,6 +59,8 @@
  .file "xdraw2.inc.S"
  
--
-+#ifndef XDRAW2_INC_MACROS_0
-+#define XDRAW2_INC_MACROS_0
+ 
++#ifndef XDRAW2_FIFO_MACROS
++#define XDRAW2_FIFO_MACROS
  .macro GR_FIFO_WRITE __addr __offset __data
        mov \__data , \__offset(\__addr)
  .endm /*  GR_FIFO_WRITE */
-@@ -69,6 +70,7 @@
+@@ -72,6 +74,7 @@
  .macro WRITE_MM1LOW_FIFO 
        movd %mm1 , (%ebp)      /*  store current param | previous param */
  .endm /*  WRITE_MM1LOW_FIFO */
@@ -18,14 +17,50 @@
  
  
  #if 0
-@@ -812,9 +814,12 @@
+@@ -815,9 +818,12 @@ LOCAL(nocull):
+ #define packCol %edi
+ #define tempVal %edi
+ 
++#ifndef XDRAW2_FIFO_MACROS
++#define XDRAW2_FIFO_MACROS
+ .macro GR_FIFO_WRITE __addr __offset __data
+       mov \__data , \__offset(\__addr)
+ .endm /*  GR_FIFO_WRITE */
++#endif
+ 
+ .align 4
+ LOCAL(__triBegin):
+--- glide3x.orig/h5/glide3/src/xdraw2.inc.s
++++ glide3x/h5/glide3/src/xdraw2.inc.s
+@@ -81,6 +81,8 @@
+ .file "xdraw2.inc.S"
+ 
+ 
++#ifndef XDRAW2_FIFO_MACROS
++#define XDRAW2_FIFO_MACROS
+ .macro GR_FIFO_WRITE __addr __offset __data
+ #ifdef HAL_CSIM
+       pushad 
+@@ -121,6 +123,7 @@
+       movd %mm1 , (%ebp)      /*  store current param | previous param */
+ #endif
+ .endm /*  WRITE_MM1LOW_FIFO */
++#endif
+ 
+ 
+ #if 0
+@@ -867,6 +870,8 @@ LOCAL(nocull):
  #define packCol %edi
  #define tempVal %edi
  
-+#ifndef XDRAW2_INC_MACROS_1
-+#define XDRAW2_INC_MACROS_1
++#ifndef XDRAW2_FIFO_MACROS
++#define XDRAW2_FIFO_MACROS
  .macro GR_FIFO_WRITE __addr __offset __data
+ #ifdef HAL_CSIM
+       pushad 
+@@ -884,6 +889,7 @@ LOCAL(nocull):
        mov \__data , \__offset(\__addr)
+ #endif
  .endm /*  GR_FIFO_WRITE */
 +#endif