summaryrefslogtreecommitdiff
path: root/src/radeon_macros.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/radeon_macros.h')
-rw-r--r--src/radeon_macros.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/radeon_macros.h b/src/radeon_macros.h
index a2719331..5beaee8f 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) \