[Cegcc-svn] SF.net SVN: cegcc: [798] trunk/cegcc/src/w32api

[<ped...@us...>]

Revision: 798
          http://svn.sourceforge.net/cegcc/?rev=798&view=rev
Author:   pedroalves
Date:     2006-11-12 12:35:31 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
This should have been committed before. Windows.h and winnt.h must be synchronized as the headers say.

Modified Paths:
--------------
    trunk/cegcc/src/w32api/ChangeLog.ce
    trunk/cegcc/src/w32api/include/windows.h

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2006-11-12 20:30:41 UTC (rev 797)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2006-11-12 20:35:31 UTC (rev 798)
@@ -24,6 +24,7 @@
 2006-11-12  Pedro Alves  <ped...@po...>
 
 	* include/winnt.h (_M_ARM, ARM): Translate from gcc target defines.
+	* include/windows.h (_M_ARM, ARM): Likewise.
 
 2006-11-11  Danny Backx <dan...@us...>
 

Modified: trunk/cegcc/src/w32api/include/windows.h
===================================================================
--- trunk/cegcc/src/w32api/include/windows.h	2006-11-12 20:30:41 UTC (rev 797)
+++ trunk/cegcc/src/w32api/include/windows.h	2006-11-12 20:35:31 UTC (rev 798)
@@ -27,6 +27,30 @@
 #elif defined(__i386__) && !defined(_M_IX86)
 #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_)
@@ -37,6 +61,8 @@
 #define _MIPS_
 #elif defined(_M_M68K) && !defined(_68K_)
 #define _68K_
+#elif defined(_M_ARM) && !defined(ARM)
+#define ARM
 #endif
 
 #ifdef RC_INVOKED


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.