summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-10-11 19:11:36 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-10-16 21:25:21 +0100
commita8c9c3699e6dfde29eeec058d903740a499dcf3b (patch)
treec8a6c06a274241d89a6226595be5cfe8dc7e8ef2
parent47df98c7851fd9e97a54f0b4950340506d4a9244 (diff)
hw/xwin/glx: Fix using Mask as a formal parameter shadows a global typedef of the same name
Fix using Mask as a formal parameter shadows the typedef of the same name from X.h indirect.c: In function 'GetShift': indirect.c:1629:14: warning: declaration of 'Mask' shadows a global declaration [-Wshadow] Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
-rw-r--r--hw/xwin/glx/indirect.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 97b6045b7..c0069a20f 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -1626,15 +1626,15 @@ glxWinCreateContext(__GLXscreen * screen,
*/
static int
-GetShift(int Mask)
+GetShift(int mask)
{
- int Shift = 0;
+ int shift = 0;
- while ((Mask &1) == 0) {
- Shift++;
- Mask >>=1;
+ while ((mask &1) == 0) {
+ shift++;
+ mask >>=1;
}
- return Shift;
+ return shift;
}
static int