Hi all,

I just committed a change to remove the _M_ARM and ARM definitions from
w32api/headers. gcc now defines those are built-ins, so we don't need them there anymore.

Cheers,
Pedro Alves

---

2006-12-18  Pedro Alves  <[EMAIL PROTECTED]>

   * include/winnt.h (_M_ARM, ARM): Remove.
   * include/windows.h (_M_ARM, ARM): Likewise.

Index: include/windows.h
===================================================================
--- include/windows.h   (revision 841)
+++ include/windows.h   (working copy)
@@ -28,29 +28,6 @@
 #define _M_IX86 300
 #endif
 
-#if !defined(_M_ARM)
-#if defined (__ARM_ARCH_4__) || defined (__ARM_ARCH_4T__)
-#define _M_ARM 4
-#elif defined (__ARM_ARCH_5__) || defined (__ARM_ARCH_5T__) \
-   || defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__)
-#define _M_ARM 5
-#elif defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6ZK__) \
-   || defined (__ARM_ARCH_6K__)
-#define _M_ARM 6
-#endif
-#endif /* !defined(_M_ARM) */
-
-#if !defined(_M_ARMT)
-#if defined (__ARM_ARCH_4T__)
-#define _M_ARMT 4
-#elif defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5TE__) || defined 
(__ARM_ARCH_5TEJ__)
-#define _M_ARMT 5
-#elif defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6ZK__) \
-   || defined (__ARM_ARCH_6K__)
-#define _M_ARMT 6
-#endif
-#endif /* !defined(_M_ARMT) */
-
 #if defined(_M_IX86) && !defined(_X86_)
 #define _X86_
 #elif defined(_M_ALPHA) && !defined(_ALPHA_)
@@ -61,8 +38,6 @@
 #define _MIPS_
 #elif defined(_M_M68K) && !defined(_68K_)
 #define _68K_
-#elif defined(_M_ARM) && !defined(ARM)
-#define ARM
 #endif
 
 #ifdef RC_INVOKED
Index: include/winnt.h
===================================================================
--- include/winnt.h     (revision 841)
+++ include/winnt.h     (working copy)
@@ -16,29 +16,6 @@
 #define _M_IX86 300
 #endif
 
-#if !defined(_M_ARM)
-#if defined (__ARM_ARCH_4__) || defined (__ARM_ARCH_4T__)
-#define _M_ARM 4
-#elif defined (__ARM_ARCH_5__) || defined (__ARM_ARCH_5T__) \
-   || defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__)
-#define _M_ARM 5
-#elif defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6ZK__) \
-   || defined (__ARM_ARCH_6K__)
-#define _M_ARM 6
-#endif
-#endif /* !defined(_M_ARM) */
-
-#if !defined(_M_ARMT)
-#if defined (__ARM_ARCH_4T__)
-#define _M_ARMT 4
-#elif defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5TE__) || defined 
(__ARM_ARCH_5TEJ__)
-#define _M_ARMT 5
-#elif defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6ZK__) \
-   || defined (__ARM_ARCH_6K__)
-#define _M_ARMT 6
-#endif
-#endif /* !defined(_M_ARMT) */
-
 #if defined(_M_IX86) && !defined(_X86_)
 #define _X86_
 #elif defined(_M_ALPHA) && !defined(_ALPHA_)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Cegcc-devel mailing list
Cegcc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cegcc-devel

Reply via email to