* Mono.Unix/Catalog.cs: s/libintl/intl/g, since intl.dll is used by …

…GTK+ on Windows, not libintl.dll (according to http://www.gimp.org/~tml/gimp/win32/downloads.html). * Mono.Posix/Catalog.cs: s/libintl/intl/g, since intl.dll is used by GTK+ on Windows, not libintl.dll (according to http://www.gimp.org/~tml/gimp/win32/downloads.html). svn path=/trunk/mcs/; revision=55154
mono · Jan 6, 2006 · ba72170 · ba72170
1 parent 1b8ed55
commit ba72170
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/mcs/class/Mono.Posix/Mono.Posix/Catalog.cs b/mcs/class/Mono.Posix/Mono.Posix/Catalog.cs
@@ -37,12 +37,12 @@ namespace Mono.Posix {
 
 	[Obsolete ("Use Mono.Unix.Catalog")]
 	public class Catalog {
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr bindtextdomain (IntPtr domainname, IntPtr dirname);
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr bind_textdomain_codeset (IntPtr domainname,
 			IntPtr codeset);
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr textdomain (IntPtr domainname);
 
 		public static void Init (String package, String localedir)
@@ -58,7 +58,7 @@ public static void Init (String package, String localedir)
 			Marshal.FreeHGlobal (iutf8);
 		}
 
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr gettext (IntPtr instring);
 
 		public static String GetString (String s)
@@ -69,7 +69,7 @@ public static String GetString (String s)
 			return t;
 		}
 
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr ngettext (IntPtr singular, IntPtr plural, Int32 n);
 
 		public static String GetPluralString (String s, String p, Int32 n)

diff --git a/mcs/class/Mono.Posix/Mono.Posix/ChangeLog b/mcs/class/Mono.Posix/Mono.Posix/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-06  Jonathan Pryor  <jonpryor@vt.edu>
+
+	* Catalog.cs: s/libintl/intl/g, since intl.dll is used by GTK+ on Windows,
+	  not libintl.dll (according to
+	  http://www.gimp.org/~tml/gimp/win32/downloads.html).
+
 2005-09-23  Jonathan Pryor  <jonpryor@vt.edu>
 
 	* Catalog.cs, PeerCred.cs, Syscall.cs, UnixEndPoint.cs: [Obsolete] public

diff --git a/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs b/mcs/class/Mono.Posix/Mono.Unix/Catalog.cs
@@ -6,7 +6,7 @@
 //   Jonathan Pryor (jonpryor@vt.edu)
 //
 // (C) 2004 Edd Dumbill
-// (C) 2005 Jonathan Pryor
+// (C) 2005-2006 Jonathan Pryor
 //
 // This file implements the low-level syscall interface to the POSIX
 // subsystem.
@@ -40,12 +40,12 @@ namespace Mono.Unix {
 	public class Catalog {
 		private Catalog () {}
 
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr bindtextdomain (IntPtr domainname, IntPtr dirname);
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr bind_textdomain_codeset (IntPtr domainname,
 			IntPtr codeset);
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr textdomain (IntPtr domainname);
 
 		public static void Init (String package, String localedir)
@@ -91,7 +91,7 @@ public static void Init (String package, String localedir)
 			}
 		}
 
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr gettext (IntPtr instring);
 
 		public static String GetString (String s)
@@ -109,7 +109,7 @@ public static String GetString (String s)
 			}
 		}
 
-		[DllImport("libintl")]
+		[DllImport("intl")]
 		static extern IntPtr ngettext (IntPtr singular, IntPtr plural, Int32 n);
 
 		public static String GetPluralString (String s, String p, Int32 n)

diff --git a/mcs/class/Mono.Posix/Mono.Unix/ChangeLog b/mcs/class/Mono.Posix/Mono.Unix/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-06  Jonathan Pryor <jonpryor@vt.edu>
+
+	* Catalog.cs: s/libintl/intl/g, since intl.dll is used by GTK+ on Windows,
+	  not libintl.dll (according to
+	  http://www.gimp.org/~tml/gimp/win32/downloads.html).
+
 2006-01-03  Jonathan Pryor <jonpryor@vt.edu>
 
 	* UnixMarshal.cs (CreateExceptionForError): Don't map ENOMEM to