[MPlayer-cvslog] r27124 - trunk/drivers/3dfx.h

[diego]

Author: diego
Date: Mon Jun 23 10:47:50 2008
New Revision: 27124

Log:
Rename some definitions to avoid clashing with system headers, fixes:
./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


Modified:
   trunk/drivers/3dfx.h

Modified: trunk/drivers/3dfx.h
==============================================================================
--- trunk/drivers/3dfx.h	(original)
+++ trunk/drivers/3dfx.h	Mon Jun 23 10:47:50 2008
@@ -259,10 +259,10 @@ typedef struct voodoo_yuv_fb_t voodoo_yu
 #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)