diff options
Diffstat (limited to 'winsup/w32api/include/winnls.h')
| -rw-r--r-- | winsup/w32api/include/winnls.h | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/winsup/w32api/include/winnls.h b/winsup/w32api/include/winnls.h index 315fa23d8..140f9e97a 100644 --- a/winsup/w32api/include/winnls.h +++ b/winsup/w32api/include/winnls.h @@ -371,22 +371,6 @@ extern "C" { #define CAL_SABBREVMONTHNAME11 44 #define CAL_SABBREVMONTHNAME12 45 #define CAL_SABBREVMONTHNAME13 46 -#if (WINVER >= 0x0410) -#define CAL_SYEARMONTH 47 -#define CAL_ITWODIGITYEARMAX 48 -#define CAL_NOUSEROVERRIDE LOCALE_NOUSEROVERRIDE -#define CAL_RETURN_NUMBER LOCALE_RETURN_NUMBER -#define CAL_USE_CP_ACP LOCALE_USE_CP_ACP -#endif -/*#if (_WIN32_WINNT >= 0x0600) -#define CAL_SSHORTESTDAYNAME1 -#define CAL_SSHORTESTDAYNAME2 -#define CAL_SSHORTESTDAYNAME3 -#define CAL_SSHORTESTDAYNAME4 -#define CAL_SSHORTESTDAYNAME5 -#define CAL_SSHORTESTDAYNAME6 -#define CAL_SSHORTESTDAYNAME7 -#endif*/ #define CAL_GREGORIAN 1 #define CAL_GREGORIAN_US 2 #define CAL_JAPAN 3 @@ -399,9 +383,6 @@ extern "C" { #define CAL_GREGORIAN_ARABIC 10 #define CAL_GREGORIAN_XLIT_ENGLISH 11 #define CAL_GREGORIAN_XLIT_FRENCH 12 -#if (_WIN32_WINNT >= 0x0600) -#define CAL_UMALQURA 23 -#endif #define CSTR_LESS_THAN 1 #define CSTR_EQUAL 2 #define CSTR_GREATER_THAN 3 @@ -424,12 +405,19 @@ extern "C" { #define LGRPID_INDIC 15 #define LGRPID_GEORGIAN 16 #define LGRPID_ARMENIAN 17 -#if (WINVER >= 0x0500) +#if (WINVER >= 0x0410) +#define CAL_SYEARMONTH 47 +#define CAL_ITWODIGITYEARMAX 48 +#define CAL_NOUSEROVERRIDE LOCALE_NOUSEROVERRIDE +#define CAL_RETURN_NUMBER LOCALE_RETURN_NUMBER +#define CAL_USE_CP_ACP LOCALE_USE_CP_ACP #define LOCALE_SYEARMONTH 0x1006 #define LOCALE_SENGCURRNAME 0x1007 #define LOCALE_SNATIVECURRNAME 0x1008 -#define LOCALE_IDEFAULTEBCDICCODEPAGE 0x1012 #define LOCALE_SSORTNAME 0x1013 +#endif /* (WINVER >= 0x0410) */ +#if (WINVER >= 0x0500) +#define LOCALE_IDEFAULTEBCDICCODEPAGE 0x1012 #define LOCALE_IDIGITSUBSTITUTION 0x1014 #define LOCALE_IPAPERSIZE 0x100A #define DATE_YEARMONTH 8 @@ -438,6 +426,26 @@ extern "C" { #define MAP_EXPAND_LIGATURES 0x2000 #define WC_NO_BEST_FIT_CHARS 1024 #endif /* (WINVER >= 0x0500) */ +#if (WINVER >= 0x0600) +/*#define CAL_SSHORTESTDAYNAME1 */ +/*#define CAL_SSHORTESTDAYNAME2 */ +/*#define CAL_SSHORTESTDAYNAME3 */ +/*#define CAL_SSHORTESTDAYNAME4 */ +/*#define CAL_SSHORTESTDAYNAME5 */ +/*#define CAL_SSHORTESTDAYNAME6 */ +/*#define CAL_SSHORTESTDAYNAME7 */ +#define CAL_UMALQURA 23 +/*#define LOCALE_SDURATION */ +/*#define LOCALE_SIETFLANGUAGE */ +/*#define LOCALE_SISO3166CTRYNAME2 */ +/*#define LOCALE_SISO639LANGNAME2 */ +/*#define LOCALE_SKEYBOARDSTOINSTALL */ +/*#define LOCALE_SNAME */ +/*#define LOCALE_SNAN */ +/*#define LOCALE_SNEGINFINITY */ +/*#define LOCALE_SPOSINFINITY */ +/*#define LOCALE_SSCRIPTS */ +#endif /* (WINVER >= 0x0600) */ #ifndef _BASETSD_H typedef long LONG_PTR; #endif |