Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / metadata / culture-info.h

diff --git a/mono/metadata/culture-info.h b/mono/metadata/culture-info.h
index 50e174ffe06743bef71b34b395e589b3227ed0df..69e9005e1e2f91422154d36399f92c196ad7f05b 100644 (file)
--- a/mono/metadata/culture-info.h
+++ b/mono/metadata/culture-info.h
@@ -1,8 +1,12 @@
+/**
+ * \file
+ */
 
 #ifndef _MONO_METADATA_CULTURE_INFO_H_
 #define _MONO_METADATA_CULTURE_INFO_H_ 1
 
 #include <glib.h>
+#include <mono/metadata/object.h>
 
 #define NUM_DAYS 7
 #define NUM_MONTHS 13
@@ -10,23 +14,20 @@
 #define NUM_CALENDARS 4
 
 #define NUM_SHORT_DATE_PATTERNS 14
-#define NUM_LONG_DATE_PATTERNS 8
+#define NUM_LONG_DATE_PATTERNS 10
 #define NUM_SHORT_TIME_PATTERNS 12
 #define NUM_LONG_TIME_PATTERNS 9
+#define NUM_YEAR_MONTH_PATTERNS 8
 
 #define idx2string(idx) (locale_strings + (idx))
+#define pattern2string(idx) (patterns + (idx))
+#define dtidx2string(idx) (datetime_strings + (idx))
 
 /* need to change this if the string data ends up to not fit in a 64KB array. */
 typedef guint16 stridx_t;
 
 typedef struct {
-       const stridx_t long_date_pattern;
-       const stridx_t short_date_pattern;
-       const stridx_t long_time_pattern;
-       const stridx_t short_time_pattern;
-       const stridx_t year_month_pattern;
        const stridx_t month_day_pattern;
-
        const stridx_t am_designator;
        const stridx_t pm_designator;
 
@@ -48,13 +49,12 @@ typedef struct {
        const stridx_t long_date_patterns [NUM_LONG_DATE_PATTERNS];
        const stridx_t short_time_patterns [NUM_SHORT_TIME_PATTERNS];
        const stridx_t long_time_patterns [NUM_LONG_TIME_PATTERNS];
+       const stridx_t year_month_patterns [NUM_YEAR_MONTH_PATTERNS];
 } DateTimeFormatEntry;
 
 typedef struct {
        const stridx_t currency_decimal_separator;
        const stridx_t currency_group_separator;
-       const stridx_t percent_decimal_separator;
-       const stridx_t percent_group_separator;
        const stridx_t number_decimal_separator;
        const stridx_t number_group_separator;
 
@@ -75,11 +75,9 @@ typedef struct {
        const gint8 number_negative_pattern;
 
        const gint8 currency_decimal_digits;
-       const gint8 percent_decimal_digits;
        const gint8 number_decimal_digits;
 
        const gint currency_group_sizes [GROUP_SIZE];
-       const gint percent_group_sizes [GROUP_SIZE];
        const gint number_group_sizes [GROUP_SIZE];     
 } NumberFormatEntry;