From 1267f93e167d951907e335bed5cbf1fa56f7357b Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 26 Oct 2000 02:58:22 +0000
Subject: [PATCH] Update.

2000-10-25  Ulrich Drepper  <drepper@redhat.com>

	* intl/Makefile (tests): Add tst-ngettext.
	* intl/tst-ngettext.c: New file.
---
 ChangeLog              |  5 ++++
 intl/Makefile          |  1 +
 intl/tst-ngettext.c    | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 linuxthreads/ChangeLog |  6 +++++
 4 files changed, 77 insertions(+)
 create mode 100644 intl/tst-ngettext.c

diff --git a/ChangeLog b/ChangeLog
index 711fc9f..1156695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* intl/Makefile (tests): Add tst-ngettext.
+	* intl/tst-ngettext.c: New file.
+
 2000-10-25  Bruno Haible  <haible@clisp.cons.org>
 
 	* manual/charset.texi: Fix spelling of __GCONV_FULL_OUTPUT.
diff --git a/intl/Makefile b/intl/Makefile
index 57e2bc3..ed9ff28 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -29,6 +29,7 @@ distribute = gettext.h gettextP.h hash-string.h loadinfo.h locale.alias \
 	     translit.po
 
 test-srcs := tst-gettext tst-translit
+tests = tst-ngettext
 
 before-compile = $(objpfx)msgs.h
 
diff --git a/intl/tst-ngettext.c b/intl/tst-ngettext.c
new file mode 100644
index 0000000..816adfa
--- /dev/null
+++ b/intl/tst-ngettext.c
@@ -0,0 +1,65 @@
+/* Test of the ngettext functions.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <langinfo.h>
+#include <libintl.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+int
+main (void)
+{
+  const char *strs[2] = { "singular", "plural" };
+  unsigned long int i;
+  int res = 0;
+
+  /* We don't want any translation here.  */
+  setenv ("LANGUAGE", "C", 1);
+  unsetenv ("OUTPUT_CHARSET");
+
+  for (i = 0; i < 30; ++i)
+    {
+      char *tr;
+
+      tr = ngettext (strs[0], strs[1], i);
+#define TEST \
+      do								      \
+	if (tr != strs[i != 1])						      \
+	  {								      \
+	    if (strcmp (tr, strs[i != 1]) == 0)				      \
+	      printf ("%lu: correct string, wrong pointer (%s)\n", i, tr);    \
+	    else							      \
+	      printf ("%lu: wrong result (%s)\n", i, tr);		      \
+	    res = 1;							      \
+	  }								      \
+      while (0)
+      TEST;
+
+      tr = dngettext ("messages", strs[0], strs[1], i);
+      TEST;
+
+      tr = dcngettext ("messages", strs[0], strs[1], i, LC_MESSAGES);
+      TEST;
+    }
+
+  return res;
+}
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 2dae2d9..b532014 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-26  Kazumoto Kojima  <kkojima@rr.iij4u.or.jp>
+	    Yutaka Niibe  <gniibe@chroot.org>
+
+	* sysdeps/sh/pt-machine.h (testandset): Since the operand of TAS.B
+	has restrictions, use register.
+
 2000-10-23  Andreas Schwab  <schwab@suse.de>
 
 	* Examples/ex14.c (TIMEOUT): Override default timeout.
-- 
2.7.4