USB CDC patch by jonor to enable working under kernel 2.6.27

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 0673f181e0d9044bb22635d2a6378976197c8424..15e911a146940800ee305efdfa9729268745abc9 100644 (file)
--- 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;