imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xsvf: Fix shadow issues on Mac

Browse Source 
wait is declared in /usr/include/sys/wait.h

Signed-off-by: Edgar Grimberg <edgar.grimberg@zylin.com>
This commit is contained in:
Edgar Grimberg 2010-06-21 23:06:15 +02:00 committed by Øyvind Harboe
parent bf8d954352
commit f44eeba16f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xsvf/xsvf.c
View File

@ -760,7 +760,7 @@ COMMAND_HANDLER(handle_xsvf_command)
XWAIT <uint8_t wait_state> <uint8_t end_state> <uint32_t usecs> XWAIT <uint8_t wait_state> <uint8_t end_state> <uint32_t usecs>
*/ */
uint8_t wait; uint8_t wait_local;
uint8_t end; uint8_t end;
uint8_t delay_buf[4]; uint8_t delay_buf[4];
@ -768,7 +768,7 @@ COMMAND_HANDLER(handle_xsvf_command)
tap_state_t end_state; tap_state_t end_state;
int delay; 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, &end, 1) < 0
|| read(xsvf_fd, delay_buf, 4) < 0) || read(xsvf_fd, delay_buf, 4) < 0)
{ {
@ -776,7 +776,7 @@ COMMAND_HANDLER(handle_xsvf_command)
break; break;
} }
wait_state = xsvf_to_tap(wait); wait_state = xsvf_to_tap(wait_local);
end_state = xsvf_to_tap(end); end_state = xsvf_to_tap(end);
delay = be_to_h_u32(delay_buf); delay = be_to_h_u32(delay_buf);
@ -804,14 +804,14 @@ COMMAND_HANDLER(handle_xsvf_command)
uint8_t clock_buf[4]; uint8_t clock_buf[4];
uint8_t usecs_buf[4]; uint8_t usecs_buf[4];
uint8_t wait; uint8_t wait_local;
uint8_t end; uint8_t end;
tap_state_t wait_state; tap_state_t wait_state;
tap_state_t end_state; tap_state_t end_state;
int clock_count; int clock_count;
int usecs; 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, &end, 1) < 0
|| read(xsvf_fd, clock_buf, 4) < 0 || read(xsvf_fd, clock_buf, 4) < 0
|| read(xsvf_fd, usecs_buf, 4) < 0) || read(xsvf_fd, usecs_buf, 4) < 0)
@ -820,7 +820,7 @@ COMMAND_HANDLER(handle_xsvf_command)
break; break;
} }
wait_state = xsvf_to_tap(wait); wait_state = xsvf_to_tap(wait_local);
end_state = xsvf_to_tap(end); end_state = xsvf_to_tap(end);
clock_count = be_to_h_u32(clock_buf); clock_count = be_to_h_u32(clock_buf);