X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fculture-info.h;h=2392e750e60591fa1eb98023bd4c7805a2680323;hb=bc00e94e0159f6f3c6a2436e9d0269ce3253f8b1;hp=07b287a9b1319820002a6e989e780d2a510c1929;hpb=821f9f675a1df76a4ae2c1e9d25493bad16274ec;p=mono.git

diff --git a/mono/metadata/culture-info.h b/mono/metadata/culture-info.h
index 07b287a9b13..2392e750e60 100644
--- a/mono/metadata/culture-info.h
+++ b/mono/metadata/culture-info.h
@@ -11,7 +11,7 @@
 
 #define NUM_SHORT_DATE_PATTERNS 14
 #define NUM_LONG_DATE_PATTERNS 8
-#define NUM_SHORT_TIME_PATTERNS 10
+#define NUM_SHORT_TIME_PATTERNS 11
 #define NUM_LONG_TIME_PATTERNS 10
 
 #define idx2string(idx) (locale_strings + (idx))
@@ -36,8 +36,8 @@ typedef struct {
 	const stridx_t month_names [NUM_MONTHS];
 	const stridx_t abbreviated_month_names [NUM_MONTHS];
 
-	gint calendar_week_rule;
-	gint first_day_of_week;
+	gint8 calendar_week_rule;
+	gint8 first_day_of_week;
 
 	const stridx_t date_separator;
 	const stridx_t time_separator;	
@@ -66,15 +66,15 @@ typedef struct {
 	const stridx_t negative_sign;
 	const stridx_t positive_sign;
 
-	gint currency_negative_pattern;
-	gint currency_positive_pattern;
-	gint percent_negative_pattern;
-	gint percent_positive_pattern;
-	gint number_negative_pattern;
+	gint8 currency_negative_pattern;
+	gint8 currency_positive_pattern;
+	gint8 percent_negative_pattern;
+	gint8 percent_positive_pattern;
+	gint8 number_negative_pattern;
 
-	gint currency_decimal_digits;
-	gint percent_decimal_digits;
-	gint number_decimal_digits;
+	gint8 currency_decimal_digits;
+	gint8 percent_decimal_digits;
+	gint8 number_decimal_digits;
 
 	const gint currency_group_sizes [GROUP_SIZE];
 	const gint percent_group_sizes [GROUP_SIZE];
@@ -90,9 +90,10 @@ typedef struct {
 } TextInfoEntry;
 
 typedef struct {
-	gint lcid;
-	gint parent_lcid;
-	gint specific_lcid;
+	gint16 lcid;
+	gint16 parent_lcid;
+	gint16 specific_lcid;
+	gint16 region_entry_index;
 	const stridx_t name;
 	const stridx_t icu_name;
 	const stridx_t englishname;
@@ -101,6 +102,7 @@ typedef struct {
 	const stridx_t win3lang;
 	const stridx_t iso3lang;
 	const stridx_t iso2lang;
+	const stridx_t territory;
 
 	gint calendar_data [NUM_OPT_CALS];
 
@@ -116,9 +118,9 @@ typedef struct {
 } CultureInfoNameEntry;
 
 typedef struct {
-	gint16 region_id;
+	gint16 lcid;
+	gint16 region_id; /* it also works as geoId in 2.0 */
 	/* gint8 measurement_system; // 0:metric 1:US 2:UK */
-	/* gint16 geo_id; */
 	const stridx_t iso2name;
 	const stridx_t iso3name;
 	const stridx_t win3name;
@@ -133,10 +135,5 @@ typedef struct {
 	gint16 region_entry_index;
 } RegionInfoNameEntry;
 
-typedef struct {
-	gint16 lcid;
-	gint16 region_entry_index;
-} RegionLCIDMap;
-
 #endif