From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Tue, 26 May 2015 11:12:02 +0000 (+0200)
Subject: [corlib] A few XI-internal functions have been renamed; use the new names.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=2b46111528da94feb9164d48c8ce82e2ddb9dcfc;p=mono.git

[corlib] A few XI-internal functions have been renamed; use the new names.
---

diff --git a/mcs/class/System/System.Net/WebConnection.cs b/mcs/class/System/System.Net/WebConnection.cs
index d54c0cab147..52a88f7e2df 100644
--- a/mcs/class/System/System.Net/WebConnection.cs
+++ b/mcs/class/System/System.Net/WebConnection.cs
@@ -106,7 +106,7 @@ namespace System.Net
 
 #if MONOTOUCH
 		[System.Runtime.InteropServices.DllImport ("__Internal")]
-		static extern void monotouch_start_wwan (string uri);
+		static extern void xamarin_start_wwan (string uri);
 #endif
 
 		internal ChunkStream ChunkStream {
@@ -171,7 +171,7 @@ namespace System.Net
 
 				if (hostEntry == null) {
 #if MONOTOUCH
-					monotouch_start_wwan (sPoint.Address.ToString ());
+					xamarin_start_wwan (sPoint.Address.ToString ());
 					hostEntry = sPoint.HostEntry;
 					if (hostEntry == null) {
 #endif
diff --git a/mcs/class/corlib/System.Globalization/RegionInfo.MonoTouch.cs b/mcs/class/corlib/System.Globalization/RegionInfo.MonoTouch.cs
index 435035b3973..22ef188f52c 100644
--- a/mcs/class/corlib/System.Globalization/RegionInfo.MonoTouch.cs
+++ b/mcs/class/corlib/System.Globalization/RegionInfo.MonoTouch.cs
@@ -42,11 +42,11 @@ namespace System.Globalization {
 	public partial class RegionInfo {
 
 		[DllImport ("__Internal")]
-		extern static string monotouch_get_locale_country_code ();
+		extern static string xamarin_get_locale_country_code ();
 
 		static RegionInfo CreateFromNSLocale ()
 		{
-			return new RegionInfo (monotouch_get_locale_country_code ());
+			return new RegionInfo (xamarin_get_locale_country_code ());
 		}
 	}
 }
diff --git a/mcs/class/corlib/System/Console.iOS.cs b/mcs/class/corlib/System/Console.iOS.cs
index 61534deffa5..00ebfb3e84f 100644
--- a/mcs/class/corlib/System/Console.iOS.cs
+++ b/mcs/class/corlib/System/Console.iOS.cs
@@ -20,7 +20,7 @@ namespace System {
 
 		class NSLogWriter : TextWriter {
 			[DllImport ("__Internal", CharSet=CharSet.Unicode)]
-			extern static void monotouch_log (string s);
+			extern static void xamarin_log (string s);
 
 			[DllImport ("/usr/lib/libSystem.dylib")]
 			extern static /* ssize_t */ IntPtr write (int fd, byte [] buffer, /* size_t */ IntPtr n);
@@ -48,7 +48,7 @@ namespace System {
 			{
 				string s = sb.ToString ();
 				try {
-					monotouch_log (s);
+					xamarin_log (s);
 				}
 				catch (Exception) {
 					try {
diff --git a/mcs/class/corlib/System/TimeZoneInfo.MonoTouch.cs b/mcs/class/corlib/System/TimeZoneInfo.MonoTouch.cs
index 1f0f1fea35d..3db0c0ab646 100644
--- a/mcs/class/corlib/System/TimeZoneInfo.MonoTouch.cs
+++ b/mcs/class/corlib/System/TimeZoneInfo.MonoTouch.cs
@@ -70,12 +70,12 @@ namespace System {
 		}
 		
 		[DllImport ("__Internal")]
-		extern static IntPtr monotouch_timezone_get_names (ref int count);
+		extern static IntPtr xamarin_timezone_get_names (ref int count);
 
 		static ReadOnlyCollection<string> GetMonoTouchNames ()
 		{
 			int count = 0;
-			IntPtr array = monotouch_timezone_get_names (ref count);
+			IntPtr array = xamarin_timezone_get_names (ref count);
 			string [] names = new string [count];
 			for (int i = 0, offset = 0; i < count; i++, offset += IntPtr.Size) {
 				IntPtr p = Marshal.ReadIntPtr (array, offset);
@@ -87,12 +87,12 @@ namespace System {
 		}
 
 		[DllImport ("__Internal")]
-		extern static IntPtr monotouch_timezone_get_data (string name, ref int size);
+		extern static IntPtr xamarin_timezone_get_data (string name, ref int size);
 
 		static Stream GetMonoTouchData (string name, bool throw_on_error = true)
 		{
 			int size = 0;
-			IntPtr data = monotouch_timezone_get_data (name, ref size);
+			IntPtr data = xamarin_timezone_get_data (name, ref size);
 			if (size <= 0) {
 				if (throw_on_error)
 					throw new TimeZoneNotFoundException (name);