Upgrade to current glibc.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 26cbabeea64102627e60731fa2681c9a342e40c8..8834cc3972d96b6893527b54e2fd7eb844bfb0f2 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-25  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale.alias: Don't use nb_NO but define aliases for it.
+
+2001-01-26  Ulrich Drepper  <drepper@redhat.com>
+
+       * loadmsgcat.c: Include <locale.h> for _LIBC.
+
 2001-03-09  Bruno Haible  <haible@clisp.cons.org>
 
        * dcigettext.c (transmem_block_t): Change to unsigned char, to avoid

diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index b175bc16c2c664a8b7f445f0fa84806c58be56aa..bb57326f15e0dd2e37648fa833aa1c10f591a514 100644 (file)
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -58,6 +58,7 @@ char *alloca ();
 
 #ifdef _LIBC
 # include <langinfo.h>
+# include <locale.h>
 #endif
 
 #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \

diff --git a/intl/locale.alias b/intl/locale.alias
index ef5aa47765877b184dda9b980943c7b9b56e11a8..48940f7459934314db0f93f6d2b979afdfb0bd2f 100644 (file)
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -1,5 +1,5 @@
 # Locale name alias data base.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000  Free Software Foundation, Inc.
+# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,8 +28,8 @@
 
 # Packages using this file: 
 
-bokmal         nb_NO.ISO-8859-1
-bokmål         nb_NO.ISO-8859-1
+bokmal         no_NO.ISO-8859-1
+bokmål         no_NO.ISO-8859-1
 catalan                ca_ES.ISO-8859-1
 croatian       hr_HR.ISO-8859-2
 czech          cs_CZ.ISO-8859-2
@@ -61,6 +61,7 @@ korean.euc    ko_KR.eucKR
 ko_KR          ko_KR.eucKR
 lithuanian      lt_LT.ISO-8859-13
 nb_NO          no_NO.ISO-8859-1
+nb_NO.ISO-8859-1 no_NO.ISO-8859-1
 norwegian       no_NO.ISO-8859-1
 nynorsk                nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2