Rename some definitions to avoid clashing with system headers, fixes:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Mon, 23 Jun 2008 08:47:50 +0000 (08:47 +0000)
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Mon, 23 Jun 2008 08:47:50 +0000 (08:47 +0000)
./drivers/3dfx.h:262:1: warning: "ROP_COPY" redefined
/usr/include/linux/fb.h:311:1: warning: this is the location of the previous definition
./drivers/3dfx.h:264:1: warning: "ROP_XOR" redefined
/usr/include/linux/fb.h:312:1: warning: this is the location of the previous definition

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@27124 b3059339-0415-0410-9bf9-f77b7e298cf2

drivers/3dfx.h

index 2649804..99d6ef0 100644 (file)
@@ -259,10 +259,10 @@ typedef struct voodoo_yuv_fb_t voodoo_yuv_fb;
 #define BIT(x) (1UL << (x))
 
 /* COMMAND_2D reg. values */
-#define ROP_COPY               0xcc     // src
-#define ROP_INVERT      0x55     // NOT dst
-#define ROP_XOR         0x66     // src XOR dst
-#define ROP_OR                 (0xee)  /* src | dst */
+#define TDFXFB_ROP_COPY         0xcc     // src
+#define TDFXFB_ROP_INVERT       0x55     // NOT dst
+#define TDFXFB_ROP_XOR          0x66     // src XOR dst
+#define TDFXFB_ROP_OR           0xee     // src | dst
 
 #define AUTOINC_DSTX                    BIT(10)
 #define AUTOINC_DSTY                    BIT(11)