summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-05-19 14:35:56 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-05-22 11:17:59 -0700
commit7413886d650aef492ecbfdc4298c2d92d9af5f87 (patch)
tree93c32dc0fafe9be0a1216507ec7bcf8a9e4ca81a
parent96ac4e61f4618332d95d1fd0e4799dd82844f90f (diff)
XQuartz: Silence clang warnings about shadow declarations
X11Application.m:1272:26: warning: declaration shadows a local variable [-Wshadow,Semantic Issue] xp_error e; ^ X11Application.m:1098:36: note: previous declaration is here - (void) sendX11NSEvent:(NSEvent *)e { ^ 1 warning generated. bundle-main.c:648:36: warning: declaration shadows a local variable [-Wshadow,Semantic Issue] int max_files, i; ^ bundle-main.c:594:9: note: previous declaration is here int i; ^ 1 warning generated. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--hw/xquartz/X11Application.m6
-rw-r--r--hw/xquartz/mach-startup/bundle-main.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 283132e75..7c41cbcb5 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1269,7 +1269,7 @@ static const char *untrusted_str(NSEvent *e) {
#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0
/* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
xp_window_id wid = 0;
- xp_error e;
+ xp_error err;
/* Sigh. Need to check that we're really over one of
* our windows. (We need to receive pointer events while
@@ -1277,9 +1277,9 @@ static const char *untrusted_str(NSEvent *e) {
* when another window is over us or we might show a tooltip)
*/
- e = xp_find_window(location.x, location.y, 0, &wid);
+ err = xp_find_window(location.x, location.y, 0, &wid);
- if (e != XP_Success || (e == XP_Success && wid == 0))
+ if (err != XP_Success || (err == XP_Success && wid == 0))
#endif
{
bgMouseLocation = location;
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 0e6291414..94c606823 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -645,7 +645,7 @@ int main(int argc, char **argv, char **envp) {
child2 = fork();
switch (child2) {
- int max_files, i;
+ int max_files;
case -1: /* error */
FatalError("fork() failed: %s\n", strerror(errno));