diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-08 00:37:41 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-08 00:37:41 +0000 |
| commit | fe86c8557a5f7d6a00c16c280347f6a520eccde0 (patch) | |
| tree | 34283bc0abe24987904b7c13ad0a1e63cabd2cfd /vidix | |
| parent | 7023cdec7b06808c5b41577a78621fc867d06246 (diff) | |
| download | mpv-fe86c8557a5f7d6a00c16c280347f6a520eccde0.tar.bz2 mpv-fe86c8557a5f7d6a00c16c280347f6a520eccde0.tar.xz | |
Fix illegal identifiers, names starting with __ are reserved for the system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25648 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/sis_regs.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vidix/sis_regs.h b/vidix/sis_regs.h index ca150204c7..a559d0514e 100644 --- a/vidix/sis_regs.h +++ b/vidix/sis_regs.h @@ -27,12 +27,12 @@ #define inSISREG(base) INPORT8(base) #define outSISREG(base,val) OUTPORT8(base, val) #define orSISREG(base,val) do { \ - unsigned char __Temp = INPORT8(base); \ - outSISREG(base, __Temp | (val)); \ + unsigned char tmp = INPORT8(base); \ + outSISREG(base, tmp | (val)); \ } while (0) #define andSISREG(base,val) do { \ - unsigned char __Temp = INPORT8(base); \ - outSISREG(base, __Temp & (val)); \ + unsigned char tmp = INPORT8(base); \ + outSISREG(base, tmp & (val)); \ } while (0) #define inSISIDXREG(base,idx,var) do { \ @@ -42,22 +42,22 @@ OUTPORT8(base, idx); OUTPORT8((base)+1, val); \ } while (0) #define orSISIDXREG(base,idx,val) do { \ - unsigned char __Temp; \ + unsigned char tmp; \ OUTPORT8(base, idx); \ - __Temp = INPORT8((base)+1)|(val); \ - outSISIDXREG(base,idx,__Temp); \ + tmp = INPORT8((base)+1)|(val); \ + outSISIDXREG(base,idx,tmp); \ } while (0) #define andSISIDXREG(base,idx,and) do { \ - unsigned char __Temp; \ + unsigned char tmp; \ OUTPORT8(base, idx); \ - __Temp = INPORT8((base)+1)&(and); \ - outSISIDXREG(base,idx,__Temp); \ + tmp = INPORT8((base)+1)&(and); \ + outSISIDXREG(base,idx,tmp); \ } while (0) #define setSISIDXREG(base,idx,and,or) do { \ - unsigned char __Temp; \ + unsigned char tmp; \ OUTPORT8(base, idx); \ - __Temp = (INPORT8((base)+1)&(and))|(or); \ - outSISIDXREG(base,idx,__Temp); \ + tmp = (INPORT8((base)+1)&(and))|(or); \ + outSISIDXREG(base,idx,tmp); \ } while (0) #define BITMASK(h,l) (((unsigned)(1U << ((h)-(l)+1))-1)<<(l)) |