Sync with trunk r63647.

[reactos.git] / include / psdk / winnt.h

diff --git a/include/psdk/winnt.h b/include/psdk/winnt.h
index d2e277b..ed71637 100644 (file)
--- a/include/psdk/winnt.h
+++ b/include/psdk/winnt.h
@@ -1460,6 +1460,8 @@ typedef enum {
 #define LANGIDFROMLCID(l)      ((WORD)(l))
 #define LANG_SYSTEM_DEFAULT    MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT)
 #define LANG_USER_DEFAULT      MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT)
+#define LOCALE_SYSTEM_DEFAULT MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT)
+#define LOCALE_USER_DEFAULT MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT)
 #define LOCALE_NEUTRAL MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT)
 #define LOCALE_INVARIANT MAKELCID(MAKELANGID(LANG_INVARIANT, SUBLANG_NEUTRAL), SORT_DEFAULT)
 #define LOCALE_NAME_MAX_LENGTH 85
@@ -3310,7 +3312,7 @@ typedef struct _CONTEXT {
        DWORD Fill[2];
 
 } CONTEXT;
-#elif defined(ARM)
+#elif defined(_ARM_)
 
 #ifndef PAGE_SIZE
 #define PAGE_SIZE                         0x1000 // FIXME: This should probably go elsewhere