From: roel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Thu, 28 Feb 2013 21:36:09 +0000 (+0000)
Subject: compiling on windows again
X-Git-Tag: v1.0.0~130^2~11
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/cb64309e4b187ada12e66c1a782f243b7924d32f

compiling on windows again
---

diff --git a/client/nonce2key/crapto1.h b/client/nonce2key/crapto1.h
index 49e8e9e4..67af4642 100644
--- a/client/nonce2key/crapto1.h
+++ b/client/nonce2key/crapto1.h
@@ -70,7 +70,7 @@ static inline int parity(uint32_t x)
 	x ^= x >> 4;
 	return BIT(0x6996, x & 0xf);
 #else
-        asm(    "movl %1, %%eax\n"
+        __asm(    "movl %1, %%eax\n"
 		"mov %%ax, %%cx\n"
 		"shrl $0x10, %%eax\n"
 		"xor %%ax, %%cx\n"
diff --git a/client/sleep.h b/client/sleep.h
index 81f4e060..62d9f4d1 100644
--- a/client/sleep.h
+++ b/client/sleep.h
@@ -11,7 +11,7 @@
 #ifndef SLEEP_H__
 #define SLEEP_H__
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #define sleep(n) Sleep(1000 * n)
 #define msleep(n) Sleep(n)
diff --git a/client/util.c b/client/util.c
index 0673f181..fa24906d 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)