headers: winnt.h: remove outdated SUBLANG_* constants The following constants are missing from winnt.h in recent Windows SDKs: 1. SUBLANG_ENGLISH_IRELAND; same as SUBLANG_ENGLISH_EIRE 2. SUBLANG_HAUSA_NIGERIA; same as SUBLANG_HAUSA_NIGERIA_LATIN 3. SUBLANG_LAO_LAO_PDR; same as SUBLANG_LAO_LAO 4. SUBLANG_LITHUANIAN_LITHUANIA; same as SUBLANG_LITHUANIAN 5. SUBLANG_PORTUGUESE_PORTUGAL; same as SUBLANG_PORTUGUESE 6. SUBLANG_SWEDISH_SWEDEN; same as SUBLANG_SWEDISH 7. SUBLANG_SYRIAC; same as SUBLANG_SYRIAC_SYRIA Each of them is an alias to another constant; for compatibility with recent Windows SDKs, the latter constants should be used instead. Signed-off-by: LIU Hao <lh_mouse@126.com>
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h index c7a6a95..013adca 100644 --- a/mingw-w64-headers/include/winnt.h +++ b/mingw-w64-headers/include/winnt.h
@@ -1164,7 +1164,6 @@ #define SUBLANG_ENGLISH_AUS 0x03 #define SUBLANG_ENGLISH_CAN 0x04 #define SUBLANG_ENGLISH_NZ 0x05 -#define SUBLANG_ENGLISH_IRELAND 0x06 #define SUBLANG_ENGLISH_EIRE 0x06 #define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07 #define SUBLANG_ENGLISH_JAMAICA 0x08 @@ -1199,7 +1198,6 @@ #define SUBLANG_GREENLANDIC_GREENLAND 0x01 #define SUBLANG_GUJARATI_INDIA 0x01 #define SUBLANG_HAUSA_NIGERIA_LATIN 0x01 -#define SUBLANG_HAUSA_NIGERIA SUBLANG_HAUSA_NIGERIA_LATIN /* SUBLANG_HAUSA_NIGERIA_LATIN is what MS defines */ #define SUBLANG_HAWAIIAN_US 0x01 #define SUBLANG_HEBREW_ISRAEL 0x01 #define SUBLANG_HINDI_INDIA 0x01 @@ -1224,11 +1222,7 @@ #define SUBLANG_KOREAN 0x01 #define SUBLANG_KYRGYZ_KYRGYZSTAN 0x01 #define SUBLANG_LAO_LAO 0x01 -#define SUBLANG_LAO_LAO_PDR SUBLANG_LAO_LAO /* SUBLANG_LAO_LAO is what MS defines */ #define SUBLANG_LATVIAN_LATVIA 0x01 -#if (WINVER >= 0x0600) -#define SUBLANG_LITHUANIAN_LITHUANIA 0x01 -#endif /* WINVER >= 0x0600 */ #define SUBLANG_LITHUANIAN 0x01 #define SUBLANG_LOWER_SORBIAN_GERMANY 0x02 #define SUBLANG_LUXEMBOURGISH_LUXEMBOURG 0x01 @@ -1254,9 +1248,6 @@ #define SUBLANG_PERSIAN_IRAN 0x01 #define SUBLANG_POLISH_POLAND 0x01 #define SUBLANG_PORTUGUESE_BRAZILIAN 0x01 -#if (WINVER >= 0x0600) -#define SUBLANG_PORTUGUESE_PORTUGAL 0x02 -#endif /* WINVER >= 0x0600 */ #define SUBLANG_PORTUGUESE 0x02 #define SUBLANG_PULAR_SENEGAL 0x02 #define SUBLANG_PUNJABI_INDIA 0x01 @@ -1317,13 +1308,9 @@ #define SUBLANG_SPANISH_PUERTO_RICO 0x14 #define SUBLANG_SPANISH_US 0x15 #define SUBLANG_SWAHILI_KENYA 0x01 -#if (WINVER >= 0x0600) -#define SUBLANG_SWEDISH_SWEDEN 0x01 -#endif /* WINVER >= 0x0600 */ #define SUBLANG_SWEDISH 0x01 #define SUBLANG_SWEDISH_FINLAND 0x02 -#define SUBLANG_SYRIAC 0x01 -#define SUBLANG_SYRIAC_SYRIA SUBLANG_SYRIAC /* SUBLANG_SYRIAC_SYRIA is what MSDN mentions */ +#define SUBLANG_SYRIAC_SYRIA 0x01 #define SUBLANG_TAJIK_TAJIKISTAN 0x01 #define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02 #define SUBLANG_TAMAZIGHT_MOROCCO_TIFINAGH 0x04