compiling on windows again

diff --git a/client/nonce2key/crapto1.h b/client/nonce2key/crapto1.h
index 49e8e9e4ea8445c266e63692c4615471196f5a76..67af4642f7c06c97522419d031458bae5c34590a 100644 (file)
--- 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
        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"
                "mov %%ax, %%cx\n"
                "shrl $0x10, %%eax\n"
                "xor %%ax, %%cx\n"

diff --git a/client/sleep.h b/client/sleep.h
index 81f4e06031943aee3c8de7b131388492d8462f80..62d9f4d16974e27ecbc85926589c2fb8b173046a 100644 (file)
--- a/client/sleep.h
+++ b/client/sleep.h
@@ -11,7 +11,7 @@
 #ifndef SLEEP_H__
 #define SLEEP_H__
 
 #ifndef SLEEP_H__
 #define SLEEP_H__
 

-#ifdef WIN32
+#ifdef _WIN32

 #include <windows.h>
 #define sleep(n) Sleep(1000 * n)
 #define msleep(n) Sleep(n)
 #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 0673f181e0d9044bb22635d2a6378976197c8424..fa24906d1d32047cefe19ed3a9eb606919daa0ba 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -10,7 +10,7 @@
 
 #include "util.h"
 
 
 #include "util.h"
 

-#ifndef WIN32
+#ifndef _WIN32

 #include <termios.h>
 #include <sys/ioctl.h> 
 int ukbhit(void)
 #include <termios.h>
 #include <sys/ioctl.h> 
 int ukbhit(void)