X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=intl%2Floadmsgcat.c;h=516f5211b6405d21af367a86657a4990b2cf231c;hb=1dc8717737084b93af2cd212e84edbd2cce1046c;hp=8509bd34587e46cf8187c146c770b1e804bb2a6e;hpb=2e0595dd8e344dbdcab740d7d2a3b67d153d6b39;p=pspp

diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 8509bd3458..516f5211b6 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -1,5 +1,5 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -34,23 +34,17 @@
 #include <sys/stat.h>
 
 #ifdef __GNUC__
-# undef  alloca
 # define alloca __builtin_alloca
 # define HAVE_ALLOCA 1
 #else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
+# if defined HAVE_ALLOCA_H || defined _LIBC
+#  include <alloca.h>
 # else
-#  if defined HAVE_ALLOCA_H || defined _LIBC
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
+#  ifdef _AIX
  #pragma alloca
-#   else
-#    ifndef alloca
+#  else
+#   ifndef alloca
 char *alloca ();
-#    endif
 #   endif
 #  endif
 # endif
@@ -826,7 +820,7 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
 	      if (outcharset == NULL || outcharset[0] == '\0')
 		{
 # ifdef _LIBC
-		  outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
+		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
 # else
 #  if HAVE_ICONV
 		  extern const char *locale_charset PARAMS ((void));