summary refs log tree commit diff
path: root/locale/setlocale.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-15 23:56:34 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-15 23:56:34 +0000
commit111bb972b2b34f424d22d35ae97a24b9407fca78 (patch)
tree002ccfeb9b2b8449eb35fdaa15bea0821551ee39 /locale/setlocale.c
parent89554807fda029995f81010a829e674d20605bdb (diff)
downloadglibc-111bb972b2b34f424d22d35ae97a24b9407fca78.tar.gz
glibc-111bb972b2b34f424d22d35ae97a24b9407fca78.tar.xz
glibc-111bb972b2b34f424d22d35ae97a24b9407fca78.zip
Update.
2000-11-15  Ulrich Drepper  <drepper@redhat.com>

	* intl/Makefile: tst-gettext2.sh does not need a third parameter.

	* intl/tst-gettext2.sh: Copy locale data.  Adjust LOCPATH.  Verify
	output of program.

	* intl/tst-gettext2.c: Set C locale if setting other locale
	failed.  Use gettext() not _().

	* locale/setlocale.c: Increment _nl_msg_cat_cntr whenever we
	successfully loaded a new locale.

2000-11-13  Andreas Jaeger  <aj@suse.de>

	* configure.in: Require gcc 2.95 or newer.

2000-11-15  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/paths.h: Adjust for FHS.
	Patch by Arkadiusz Miskiewicz <misiek@pld.ORG.PL>.

2000-11-11  Jim Meyering  <meyering@lucent.com>

	* string/strndup.c (strndup): Cast return value to `char *'.

2000-11-15  Jim Meyering  <meyering@ascend.com>

	* sysdeps/generic/memchr.c: Remove some useless parentheses.
	[HAVE_STDLIB_H || defined _LIBC]: Include <stdlib.h>.
	[HAVE_BP_SYM_H || defined _LIBC]: Guard inclusion of bp-sym.h.
	[! (HAVE_BP_SYM_H || defined _LIBC)] (BP_SYM): Define as no-op.
	Also #undef __memchr.
	Use `weak_alias' only if it's defined.

2000-11-10  H.J. Lu  <hjl@gnu.org>

	* Makefile.in (install): Set LANGUAGE=C LC_ALL=C.
Diffstat (limited to 'locale/setlocale.c')
-rw-r--r--locale/setlocale.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 08f2a034d1..3598eceac4 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -120,6 +120,9 @@ static const char *_nl_current_names[] =
 /* Lock for protecting global data.  */
 __libc_lock_define_initialized (, __libc_setlocale_lock)
 
+/* Defined in loadmsgcat.c.  */
+extern int _nl_msg_cat_cntr;
+
 
 /* Use this when we come along an error.  */
 #define ERROR_RETURN							      \
@@ -334,6 +337,10 @@ setlocale (int category, const char *locale)
 		setname (category, newnames[category]);
 	      }
 	  setname (LC_ALL, composite);
+
+	  /* We successfully loaded a new locale.  Let the message catalog
+	     functions know about this.  */
+	  ++_nl_msg_cat_cntr;
 	}
 
       /* Critical section left.  */
@@ -384,6 +391,10 @@ setlocale (int category, const char *locale)
 
 	  setname (category, newname[0]);
 	  setname (LC_ALL, composite);
+
+	  /* We successfully loaded a new locale.  Let the message catalog
+	     functions know about this.  */
+	  ++_nl_msg_cat_cntr;
 	}
 
       /* Critical section left.  */