From 923949d5dd822596bf6af79454ca21baa9cc0086 Mon Sep 17 00:00:00 2001
From: Sid Price <sid@sidprice.com>
Date: Sat, 2 May 2020 15:23:15 -0600
Subject: [PATCH] Fixed variable/function name clash building on Windows

---
 src/target/cortexm.c | 46 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/target/cortexm.c b/src/target/cortexm.c
index e047def..c95b52a 100644
--- a/src/target/cortexm.c
+++ b/src/target/cortexm.c
@@ -1259,29 +1259,29 @@ static int cortexm_hostio_request(target *t)
 		}
 
 	case SYS_ISERROR: { /* iserror */
-		int errno = params[0];
-		ret = (errno == TARGET_EPERM) ||
-		      (errno == TARGET_ENOENT) ||
-		      (errno == TARGET_EINTR) ||
-		      (errno == TARGET_EIO) ||
-		      (errno == TARGET_EBADF) ||
-		      (errno == TARGET_EACCES) ||
-		      (errno == TARGET_EFAULT) ||
-		      (errno == TARGET_EBUSY) ||
-		      (errno == TARGET_EEXIST) ||
-		      (errno == TARGET_ENODEV) ||
-		      (errno == TARGET_ENOTDIR) ||
-		      (errno == TARGET_EISDIR) ||
-		      (errno == TARGET_EINVAL) ||
-		      (errno == TARGET_ENFILE) ||
-		      (errno == TARGET_EMFILE) ||
-		      (errno == TARGET_EFBIG) ||
-		      (errno == TARGET_ENOSPC) ||
-		      (errno == TARGET_ESPIPE) ||
-		      (errno == TARGET_EROFS) ||
-		      (errno == TARGET_ENOSYS) ||
-		      (errno == TARGET_ENAMETOOLONG) ||
-		      (errno == TARGET_EUNKNOWN);
+		int errorNo = params[0];
+		ret = (errorNo == TARGET_EPERM) ||
+			  (errorNo == TARGET_ENOENT) ||
+			  (errorNo == TARGET_EINTR) ||
+			  (errorNo == TARGET_EIO) ||
+			  (errorNo == TARGET_EBADF) ||
+			  (errorNo == TARGET_EACCES) ||
+			  (errorNo == TARGET_EFAULT) ||
+			  (errorNo == TARGET_EBUSY) ||
+			  (errorNo == TARGET_EEXIST) ||
+			  (errorNo == TARGET_ENODEV) ||
+			  (errorNo == TARGET_ENOTDIR) ||
+			  (errorNo == TARGET_EISDIR) ||
+			  (errorNo == TARGET_EINVAL) ||
+			  (errorNo == TARGET_ENFILE) ||
+			  (errorNo == TARGET_EMFILE) ||
+			  (errorNo == TARGET_EFBIG) ||
+			  (errorNo == TARGET_ENOSPC) ||
+			  (errorNo == TARGET_ESPIPE) ||
+			  (errorNo == TARGET_EROFS) ||
+			  (errorNo == TARGET_ENOSYS) ||
+			  (errorNo == TARGET_ENAMETOOLONG) ||
+			  (errorNo == TARGET_EUNKNOWN);
 		break;
 		}