summaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-03-17 21:53:01 +0000
committerJakub Jelinek <jakub@redhat.com>2007-03-17 21:53:01 +0000
commit6ce38a95a4c8318df75cf91fbd90101601b3fa7f (patch)
tree044df11ca5f10f967644dffe5b0f621d6ac36188 /localedata
parentb428b742cf54d423e5a7a68fcbec9473303eeafa (diff)
Updated to fedora-glibc-20070317T2130cvs/fedora-glibc-2_5_90-19
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog5
-rw-r--r--localedata/Makefile2
-rw-r--r--localedata/tst-sscanf.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index e1bc145ec3..789b58d4f7 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-07 Steven Munroe <sjmunroe@us.ibm.com>
+
+ * Makefile: Define tst-sscanf-ENV.
+ * tst-sscanf.c: Use fa_IR.UTF-8 which exists internally.
+
2007-02-18 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-sscanf.
diff --git a/localedata/Makefile b/localedata/Makefile
index f7a6a6c658..6b9ce6531a 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -290,6 +290,8 @@ tst-setlocale-ENV = LOCPATH=$(common-objpfx)localedata LC_ALL=ja_JP.EUC-JP
bug-iconv-trans-ENV = LOCPATH=$(common-objpfx)localedata
+tst-sscanf-ENV = LOCPATH=$(common-objpfx)localedata
+
tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \
LOCPATH=$(common-objpfx)localedata
$(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
diff --git a/localedata/tst-sscanf.c b/localedata/tst-sscanf.c
index 89a77a14f8..32c13285a9 100644
--- a/localedata/tst-sscanf.c
+++ b/localedata/tst-sscanf.c
@@ -36,7 +36,7 @@ check_sscanf (const char *s, const char *format, const float n)
static int
do_test (void)
{
- if (setlocale (LC_ALL, "fa_IR") == NULL)
+ if (setlocale (LC_ALL, "fa_IR.UTF-8") == NULL)
{
puts ("cannot set fa_IR locale");
return 1;