Libc-391.tar.gz

[apple/libc.git] / nls / FreeBSD / msgcat.c.patch

diff --git a/nls/FreeBSD/msgcat.c.patch b/nls/FreeBSD/msgcat.c.patch
index e81ed927b8643118c5edb0bb719fd8a54e9d5d48..10c11b7fe7f9747cb25b5138ca079614eee62d72 100644 (file)
--- a/nls/FreeBSD/msgcat.c.patch
+++ b/nls/FreeBSD/msgcat.c.patch
@@ -1,5 +1,14 @@
---- msgcat.c.orig      Sun Oct 27 09:44:33 2002
-+++ msgcat.c   Sat May  3 14:19:40 2003
+--- msgcat.c.orig      2004-11-25 11:38:30.000000000 -0800
++++ msgcat.c   2005-02-27 12:06:52.000000000 -0800
+@@ -45,7 +45,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <limits.h>
+-#include <locale.h>
++#include <xlocale.h>
+ #include <nl_types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
 @@ -54,7 +54,7 @@
  #include "un-namespace.h"
  
@@ -9,3 +18,12 @@
  
  #define _DEFAULT_NLS_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L:/usr/local/share/nls/%L/%N.cat:/usr/local/share/nls/%N/%L"
  
+@@ -87,7 +87,7 @@
+               return (loadCat(name));
+ 
+       if (type == NL_CAT_LOCALE)
+-              lang = setlocale(LC_MESSAGES, NULL);
++              lang = (char *)querylocale(LC_MESSAGES_MASK, NULL);
+       else
+               lang = getenv("LANG");
+