From: Edgar Grimberg <edgar.grimberg@zylin.com>
Date: Mon, 21 Jun 2010 21:04:16 +0000 (+0200)
Subject: target: Fix shadow issues on Mac
X-Git-Tag: v0.5.0-rc1~550
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bf8d954352465826e84a245bd4ec8c958eb91c21;p=openocd

target: Fix shadow issues on Mac

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

Signed-off-by: Edgar Grimberg <edgar.grimberg@zylin.com>
---

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;
 	}