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

diff --git a/mono/metadata/locales.c b/mono/metadata/locales.c
index dd781e8fa9a..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)
 {
@@ -936,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;
 }