summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdgar Grimberg <edgar.grimberg@zylin.com>2010-06-21 23:04:16 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-06-22 08:24:23 +0200
commitbf8d954352465826e84a245bd4ec8c958eb91c21 (patch)
treedd8f4a429b29ad0e8af8c2d714f19d1b797c6c2f
parentbef497aeb069314cae3a13dd339a181a3ecf67cd (diff)
downloadopenocd_libswd-bf8d954352465826e84a245bd4ec8c958eb91c21.tar.gz
openocd_libswd-bf8d954352465826e84a245bd4ec8c958eb91c21.tar.bz2
openocd_libswd-bf8d954352465826e84a245bd4ec8c958eb91c21.tar.xz
openocd_libswd-bf8d954352465826e84a245bd4ec8c958eb91c21.zip
target: Fix shadow issues on Mac
wait is declared in /usr/include/sys/wait.h Signed-off-by: Edgar Grimberg <edgar.grimberg@zylin.com>
-rw-r--r--src/target/target.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/target/target.c b/src/target/target.c
index 9599feca..7513346a 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2135,11 +2135,11 @@ COMMAND_HANDLER(handle_halt_command)
if (CMD_ARGC == 1)
{
- unsigned wait;
- retval = parse_uint(CMD_ARGV[0], &wait);
+ unsigned wait_local;
+ retval = parse_uint(CMD_ARGV[0], &wait_local);
if (ERROR_OK != retval)
return ERROR_COMMAND_SYNTAX_ERROR;
- if (!wait)
+ if (!wait_local)
return ERROR_OK;
}