diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:36 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:36 +0000 |
| commit | 73105e438e90f950249cb265ba99001d4db3dc60 (patch) | |
| tree | add0e49232de50548191a4243ed0d32cc91d1ec5 /src/radeon_macros.h | |
| parent | 0a53864f9581196604d04fd28b4e94a9b0b73d18 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'src/radeon_macros.h')
| -rw-r--r-- | src/radeon_macros.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/radeon_macros.h b/src/radeon_macros.h index a271933..5beaee8 100644 --- a/src/radeon_macros.h +++ b/src/radeon_macros.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_macros.h,v 1.1 2002/12/16 16:19:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_macros.h,v 1.3 2003/07/08 16:55:35 tsi Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -85,10 +85,10 @@ do { \ #define OUTPLLP(pScrn, addr, val, mask) \ do { \ - CARD32 tmp = INPLL(pScrn, addr); \ - tmp &= (mask); \ - tmp |= (val); \ - OUTPLL(addr, tmp); \ + CARD32 tmp_ = INPLL(pScrn, addr); \ + tmp_ &= (mask); \ + tmp_ |= (val); \ + OUTPLL(addr, tmp_); \ } while (0) #define OUTPAL_START(idx) \ |