summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEdgar Grimberg <edgar.grimberg@zylin.com>2010-06-21 23:06:15 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-22 08:24:26 +0200
commitf44eeba16f3e9bebfbc78fd0841124d8b2556246 (patch)
tree88554921dda83a89585d9cad2d3664a5bfc9137b /src
parentbf8d954352465826e84a245bd4ec8c958eb91c21 (diff)
downloadopenocd+libswd-f44eeba16f3e9bebfbc78fd0841124d8b2556246.tar.gz
openocd+libswd-f44eeba16f3e9bebfbc78fd0841124d8b2556246.tar.bz2
openocd+libswd-f44eeba16f3e9bebfbc78fd0841124d8b2556246.tar.xz
openocd+libswd-f44eeba16f3e9bebfbc78fd0841124d8b2556246.zip
xsvf: Fix shadow issues on Mac
wait is declared in /usr/include/sys/wait.h Signed-off-by: Edgar Grimberg <edgar.grimberg@zylin.com>
Diffstat (limited to 'src')
-rw-r--r--src/xsvf/xsvf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index f4d09ff9..157d7280 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -760,7 +760,7 @@ COMMAND_HANDLER(handle_xsvf_command)
XWAIT <uint8_t wait_state> <uint8_t end_state> <uint32_t usecs>
*/
- 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);