X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Flocales.c;h=e0440729a1a6ee4bfd8851138d66e16984375935;hb=63a4c83093f3ca1e85c1a98f380d02c19d95689d;hp=b8a26d71fa4595116463424da1ad20d301473ff6;hpb=669beaed8380fa592533c8755f72593b4422d01d;p=mono.git

diff --git a/mono/metadata/locales.c b/mono/metadata/locales.c
index b8a26d71fa4..e0440729a1a 100644
--- a/mono/metadata/locales.c
+++ b/mono/metadata/locales.c
@@ -300,25 +300,6 @@ construct_culture_from_specific_name (MonoCultureInfo *ci, gchar *name)
 	return construct_culture (ci, entry);
 }
 
-static gboolean
-construct_region_from_specific_name (MonoRegionInfo *ri, gchar *name)
-{
-	const RegionInfoEntry *entry;
-	const RegionInfoNameEntry *ne;
-
-	MONO_ARCH_SAVE_REGS;
-
-	ne = bsearch (name, region_name_entries, NUM_REGION_ENTRIES,
-			sizeof (RegionInfoNameEntry), region_name_locator);
-
-	if (ne == NULL)
-		return FALSE;
-
-	entry = &region_entries [ne->region_entry_index];
-
-	return construct_region (ri, entry);
-}
-
 static const CultureInfoEntry*
 culture_info_entry_from_lcid (int lcid)
 {
@@ -628,16 +609,6 @@ ves_icall_System_Globalization_CultureInfo_internal_is_lcid_neutral (gint lcid,
 	return TRUE;
 }
 
-void ves_icall_System_Globalization_CultureInfo_construct_internal_locale (MonoCultureInfo *this, MonoString *locale)
-{
-	MONO_ARCH_SAVE_REGS;
-	
-	/* Always claim "unknown locale" if we don't have ICU (only
-	 * called for non-invariant locales)
-	 */
-	mono_raise_exception((MonoException *)mono_exception_from_name(mono_get_corlib (), "System", "ArgumentException"));
-}
-
 void ves_icall_System_Globalization_CompareInfo_construct_compareinfo (MonoCompareInfo *comp, MonoString *locale)
 {
 	/* Nothing to do here */
@@ -946,12 +917,12 @@ void load_normalization_resource (guint8 **argProps,
 				  guint8 **argMapIdxToComposite,
 				  guint8 **argCombiningClass)
 {
-	*argProps = props;
+	*argProps = (guint8*)props;
 	*argMappedChars = (guint8*) mappedChars;
 	*argCharMapIndex = (guint8*) charMapIndex;
 	*argHelperIndex = (guint8*) helperIndex;
 	*argMapIdxToComposite = (guint8*) mapIdxToComposite;
-	*argCombiningClass = combiningClass;
+	*argCombiningClass = (guint8*)combiningClass;
 }