nls/FreeBSD/msgcat.c.patch

   1 --- msgcat.c.orig       2004-11-25 11:38:30.000000000 -0800
   2 +++ msgcat.c    2005-02-27 12:06:52.000000000 -0800
   3 @@ -45,7 +45,7 @@
   4  #include <errno.h>
   5  #include <fcntl.h>
   6  #include <limits.h>
   7 -#include <locale.h>
   8 +#include <xlocale.h>
   9  #include <nl_types.h>
  10  #include <stdio.h>
  11  #include <stdlib.h>
  12 @@ -54,7 +54,7 @@
  13  #include "un-namespace.h"
  14
  15  #include "msgcat.h"
  16 -#include "../locale/setlocale.h"        /* for ENCODING_LEN */
  17 +#include "setlocale.h"        /* for ENCODING_LEN */
  18
  19  #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"
  20
  21 @@ -87,7 +87,7 @@
  22                 return (loadCat(name));
  23
  24         if (type == NL_CAT_LOCALE)
  25 -               lang = setlocale(LC_MESSAGES, NULL);
  26 +               lang = (char *)querylocale(LC_MESSAGES_MASK, NULL);
  27         else
  28                 lang = getenv("LANG");
  29