X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e0c635d19c58423d88ae698788a31c865e5554ab..45dda9fcd7d47018c81a86688e2aaa63ba09d018:/client/util.c

diff --git a/client/util.c b/client/util.c
index 0673f181..15e911a1 100644
--- a/client/util.c
+++ b/client/util.c
@@ -10,7 +10,7 @@
 
 #include "util.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <termios.h>
 #include <sys/ioctl.h> 
 int ukbhit(void)
@@ -188,7 +188,7 @@ uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 	int bg, en;
 
 	if (!param_getptr(line, &bg, &en, paramnum)) 
-		return strtol(&line[bg], NULL, base) & 0xff;
+		return strtoul(&line[bg], NULL, base) & 0xff;
 	else
 		return deflt;
 }
@@ -198,7 +198,7 @@ uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
 	int bg, en;
 
 	if (!param_getptr(line, &bg, &en, paramnum)) 
-		return strtol(&line[bg], NULL, base);
+		return strtoul(&line[bg], NULL, base);
 	else
 		return deflt;
 }
@@ -208,7 +208,7 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
 	int bg, en;
 
 	if (!param_getptr(line, &bg, &en, paramnum)) 
-		return strtoll(&line[bg], NULL, base);
+		return strtoull(&line[bg], NULL, base);
 	else
 		return deflt;