diff --git a/src/cpu_common/x87_ops.h b/src/cpu_common/x87_ops.h
index e1d04c96f..3b8d038cb 100644
--- a/src/cpu_common/x87_ops.h
+++ b/src/cpu_common/x87_ops.h
@@ -354,7 +354,7 @@ static __inline uint16_t x87_compare(double a, double b)
 
 static __inline uint16_t x87_ucompare(double a, double b)
 {
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32 || defined __amd64__
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_X64 || defined __amd64__
         uint32_t result;
         
 #ifndef _MSC_VER
diff --git a/src/x87_bak/x87_ops.h b/src/x87_bak/x87_ops.h
index 44d73a0b1..5e1530a23 100644
--- a/src/x87_bak/x87_ops.h
+++ b/src/x87_bak/x87_ops.h
@@ -422,7 +422,7 @@ static __inline uint16_t x87_compare(double a, double b)
 
 static __inline uint16_t x87_ucompare(double a, double b)
 {
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32 || defined __amd64__
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined _M_X64 || defined __amd64__
         uint32_t result;
         
 #ifndef _MSC_VER