diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-23 08:47:50 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-23 08:47:50 +0000 |
| commit | da4a5765ab0616fb03db8073239cc536730c890e (patch) | |
| tree | 6d2ecd70b611c41f11d44d8e1f4d6c3331dba2ac /drivers | |
| parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
| download | mpv-da4a5765ab0616fb03db8073239cc536730c890e.tar.bz2 mpv-da4a5765ab0616fb03db8073239cc536730c890e.tar.xz | |
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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27124 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/3dfx.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/3dfx.h b/drivers/3dfx.h index 2649804006..99d6ef0a75 100644 --- a/drivers/3dfx.h +++ b/drivers/3dfx.h @@ -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) |