Author: akhaldi Date: Thu Jun 10 15:35:16 2010 New Revision: 47736
URL: http://svn.reactos.org/svn/reactos?rev=47736&view=rev Log: [PSDK] - Deduplicate/improve architecture related definitions.
Modified: trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winnt.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 15:35:16 2010 @@ -21,6 +21,29 @@
#ifdef _MAC #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)
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 15:35:16 2010 @@ -17,18 +17,27 @@ #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
Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=47... ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Jun 10 15:35:16 2010 @@ -9,20 +9,6 @@
#ifdef __GNUC__ #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