From eb3a7eb1a4a35f1f0cb465071712c2b0d531dbbc Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 10 Jun 2010 15:35:16 +0000
Subject: [PATCH] [PSDK] - Deduplicate/improve architecture related
 definitions.

svn path=/trunk/; revision=47736
---
 reactos/include/psdk/basetsd.h | 23 +++++++++++++++++++++++
 reactos/include/psdk/windows.h | 21 +++++++++++++++------
 reactos/include/psdk/winnt.h   | 14 --------------
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/reactos/include/psdk/basetsd.h b/reactos/include/psdk/basetsd.h
index 382418678a7..0216e499313 100644
--- a/reactos/include/psdk/basetsd.h
+++ b/reactos/include/psdk/basetsd.h
@@ -23,6 +23,29 @@
 #error Not supported.
 #endif
 
+#if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) && !defined(_ALPHA_) && \
+    !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_)
+
+#if defined(_M_IX86)
+#define _X86_
+#elif defined(_M_AMD64) || defined(__x86_64__)
+#define _AMD64_
+#elif defined(_M_IA64) || defined(__ia64__)
+#define _IA64_
+#elif defined(_M_ALPHA) || defined(__alpha__)
+#define _ALPHA_
+#elif defined(_M_ARM) || defined(__arm__)
+#define _ARM_
+#elif defined(_M_PPC) || defined(__powerpc__)
+#define _PPC_
+#elif defined(_M_MRX000) || defined(__mips__)
+#define _MIPS_
+#elif defined(_M_M68K) || defined(__68k__)
+#define _68K_
+#endif
+
+#endif
+
 #if !defined(MIDL_PASS) && !defined(RC_INVOKED)
  #define POINTER_64 __ptr64
  #if defined(_WIN64)
diff --git a/reactos/include/psdk/windows.h b/reactos/include/psdk/windows.h
index 342239827a8..aa5a4eb0ef8 100644
--- a/reactos/include/psdk/windows.h
+++ b/reactos/include/psdk/windows.h
@@ -17,20 +17,29 @@
 #include <msvctarget.h>
 #endif
 
-#if defined(_M_IX86) && !defined(_X86_)
+#if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) && !defined(_ALPHA_) && \
+    !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_)
+
+#if defined(_M_IX86)
 #define _X86_
-#elif defined(_M_ALPHA) && !defined(_ALPHA_)
+#elif defined(_M_AMD64) || defined(__x86_64__)
+#define _AMD64_
+#elif defined(_M_IA64) || defined(__ia64__)
+#define _IA64_
+#elif defined(_M_ALPHA) || defined(__alpha__)
 #define _ALPHA_
-#elif defined(_M_ARM) && !defined(_ARM_)
+#elif defined(_M_ARM) || defined(__arm__)
 #define _ARM_
-#elif defined(_M_PPC) && !defined(_PPC_)
+#elif defined(_M_PPC) || defined(__powerpc__)
 #define _PPC_
-#elif defined(_M_MRX000) && !defined(_MIPS_)
+#elif defined(_M_MRX000) || defined(__mips__)
 #define _MIPS_
-#elif defined(_M_M68K) && !defined(_68K_)
+#elif defined(_M_M68K) || defined(__68k__)
 #define _68K_
 #endif
 
+#endif
+
 #ifdef RC_INVOKED
 /* winresrc.h includes the necessary headers */
 #include <winresrc.h>
diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 10c4a14e39f..469b5f8722c 100644
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -11,20 +11,6 @@
 #include <msvctarget.h>
 #endif
 
-#if defined(_M_IX86) && !defined(_X86_)
-#define _X86_
-#elif defined(_M_ALPHA) && !defined(_ALPHA_)
-#define _ALPHA_
-#elif defined(_M_ARM) && !defined(_ARM_)
-#define _ARM_
-#elif defined(_M_PPC) && !defined(_PPC_)
-#define _PPC_
-#elif defined(_M_MRX000) && !defined(_MIPS_)
-#define _MIPS_
-#elif defined(_M_M68K) && !defined(_68K_)
-#define _68K_
-#endif
-
 #ifndef DECLSPEC_ALIGN
 # if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS)
 #  define DECLSPEC_ALIGN(x) __declspec(align(x))
-- 
2.17.1