From f44eeba16f3e9bebfbc78fd0841124d8b2556246 Mon Sep 17 00:00:00 2001 From: Edgar Grimberg Date: Mon, 21 Jun 2010 23:06:15 +0200 Subject: [PATCH] xsvf: Fix shadow issues on Mac wait is declared in /usr/include/sys/wait.h Signed-off-by: Edgar Grimberg --- src/xsvf/xsvf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index f4d09ff929..157d728041 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -760,7 +760,7 @@ COMMAND_HANDLER(handle_xsvf_command) XWAIT */ - uint8_t wait; + uint8_t wait_local; uint8_t end; uint8_t delay_buf[4]; @@ -768,7 +768,7 @@ COMMAND_HANDLER(handle_xsvf_command) tap_state_t end_state; int delay; - if (read(xsvf_fd, &wait, 1) < 0 + if (read(xsvf_fd, &wait_local, 1) < 0 || read(xsvf_fd, &end, 1) < 0 || read(xsvf_fd, delay_buf, 4) < 0) { @@ -776,7 +776,7 @@ COMMAND_HANDLER(handle_xsvf_command) break; } - wait_state = xsvf_to_tap(wait); + wait_state = xsvf_to_tap(wait_local); end_state = xsvf_to_tap(end); delay = be_to_h_u32(delay_buf); @@ -804,14 +804,14 @@ COMMAND_HANDLER(handle_xsvf_command) uint8_t clock_buf[4]; uint8_t usecs_buf[4]; - uint8_t wait; + uint8_t wait_local; uint8_t end; tap_state_t wait_state; tap_state_t end_state; int clock_count; int usecs; - if (read(xsvf_fd, &wait, 1) < 0 + if (read(xsvf_fd, &wait_local, 1) < 0 || read(xsvf_fd, &end, 1) < 0 || read(xsvf_fd, clock_buf, 4) < 0 || read(xsvf_fd, usecs_buf, 4) < 0) @@ -820,7 +820,7 @@ COMMAND_HANDLER(handle_xsvf_command) break; } - wait_state = xsvf_to_tap(wait); + wait_state = xsvf_to_tap(wait_local); end_state = xsvf_to_tap(end); clock_count = be_to_h_u32(clock_buf); -- 2.30.2