summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-02-05 15:10:27 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2014-02-05 15:10:27 +1000
commitc64130c13bd6914a998a8e8b808a6cedd18f9384 (patch)
treef0e511d65a8acbada0f6fd00cdf909fb0ce23e73
parent72967d6c153b0d1109df23967e1a05c3c397a1e0 (diff)
dix: fix a -Wshadow warning
dispatch.c: In function 'SetVendorString': dispatch.c:481:29: warning: declaration of 'string' shadows a global declaration [-Wshadow] SetVendorString(const char *string) ^ dispatch.c:135:21: warning: shadowed declaration is here [-Wshadow] typedef const char *string; Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com>
-rw-r--r--dix/dispatch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 9a5658db0..4f830f7f4 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -478,9 +478,9 @@ SetVendorRelease(int release)
}
void
-SetVendorString(const char *string)
+SetVendorString(const char *vendor)
{
- VendorString = string;
+ VendorString = vendor;
}
Bool