[akhaldi] 47744: [PSDK] - Move the amd64 check before the i386 one, and also check for __i386__

Author: akhaldi
Date: Thu Jun 10 20:31:21 2010
New Revision: 47744

URL: http://svn.reactos.org/svn/reactos?rev=47744&view=rev
Log:
[PSDK]
- Move the amd64 check before the i386 one, and also check for __i386__

Modified:
    trunk/reactos/include/psdk/basetsd.h
    trunk/reactos/include/psdk/windows.h

Modified: trunk/reactos/include/psdk/basetsd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Thu Jun 10 20:31:21 2010
@@ -26,10 +26,10 @@
 #if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) &&
!defined(_ALPHA_) && \
     !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) &&
!defined(_68K_)
 
-#if defined(_M_IX86)
+#if defined(_M_AMD64) || defined(__x86_64__)
+#define _AMD64_
+#elif defined(_M_IX86) || defined(__i386__)
 #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__)

Modified: trunk/reactos/include/psdk/windows.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Thu Jun 10 20:31:21 2010
@@ -20,10 +20,10 @@
 #if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) &&
!defined(_ALPHA_) && \
     !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) &&
!defined(_68K_)
 
-#if defined(_M_IX86)
+#if defined(_M_AMD64) || defined(__x86_64__)
+#define _AMD64_
+#elif defined(_M_IX86) || defined(__i386__)
 #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__)