include: Don't define _WIN64 on ILP32 architectures

André Hentschel nerv at dawncrow.de
Mon Apr 28 13:47:00 CDT 2014


e.g. x32 and similar platforms

---
 include/basetsd.h | 2 +-
 include/windef.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/basetsd.h b/include/basetsd.h
index f855352..db50178 100644
--- a/include/basetsd.h
+++ b/include/basetsd.h
@@ -36,7 +36,7 @@ extern "C" {
  * 64-bit.
  */
 
-#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64)
+#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) && !defined(__ILP32__)
 #define _WIN64
 #endif
 
diff --git a/include/windef.h b/include/windef.h
index 9322c41..c9e808f 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -37,7 +37,7 @@ extern "C" {
 
 /* Calling conventions definitions */
 
-#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64)
+#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) && !defined(__ILP32__)
 #define _WIN64
 #endif
 
-- 
1.8.1.2




More information about the wine-patches mailing list