new dynarec: Stop using WIN32 and _WIN32 to identify x86 MSVC WIN32 is defined in all Windows platforms, including Windows ARM

2020-03-29 08:39:33 +08:00
parent 8bcacb1a59
commit 9ed018eb96
7 changed files with 7 additions and 7 deletions
--- a/src/cpu_common/x87_ops.h
+++ b/src/cpu_common/x87_ops.h
@@ -411,7 +411,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_AMD64 || defined __amd64__
        uint32_t result;
        
 #ifndef _MSC_VER
--- a/src/cpu_new/codegen_backend.h
+++ b/src/cpu_new/codegen_backend.h
@@ -3,7 +3,7 @@

 #if defined __amd64__
 #include "codegen_backend_x86-64.h"
-#elif defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#elif defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86
 #include "codegen_backend_x86.h"
 #elif defined __ARM_EABI__
 #include "codegen_backend_arm.h"
--- a/src/cpu_new/codegen_backend_x86.c
+++ b/src/cpu_new/codegen_backend_x86.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86

 #include <stddef.h>
 #include <stdint.h>
--- a/src/cpu_new/codegen_backend_x86_ops.c
+++ b/src/cpu_new/codegen_backend_x86_ops.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86

 #include <stdint.h>
 #include <86box/86box.h>
--- a/src/cpu_new/codegen_backend_x86_ops_fpu.c
+++ b/src/cpu_new/codegen_backend_x86_ops_fpu.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86

 #include <stdint.h>
 #include <86box/86box.h>
--- a/src/cpu_new/codegen_backend_x86_ops_sse.c
+++ b/src/cpu_new/codegen_backend_x86_ops_sse.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86

 #include <stdint.h>
 #include <86box/86box.h>
--- a/src/cpu_new/codegen_backend_x86_uops.c
+++ b/src/cpu_new/codegen_backend_x86_uops.c
@@ -1,4 +1,4 @@
-#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32
+#if defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86

 #include <stdint.h>
 #include <86box/86box.h>