about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2013-11-11 16:28:03 +0100
committerAndreas Schwab <schwab@suse.de>2013-11-14 16:02:59 +0100
commit714bd261e8d24273b3c34d8e0c3f1d611b79ef6f (patch)
tree5f24d0e97e3df70f96f7a43f0a560e3358b691d3
parent7ab44563a9c8118ce47da29919540c793f549774 (diff)
downloadglibc-714bd261e8d24273b3c34d8e0c3f1d611b79ef6f.tar.gz
glibc-714bd261e8d24273b3c34d8e0c3f1d611b79ef6f.tar.xz
glibc-714bd261e8d24273b3c34d8e0c3f1d611b79ef6f.zip
Fix country_num element in LC_ADDRESS for C locale
-rw-r--r--ChangeLog5
-rw-r--r--locale/C-address.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e9089c71e9..60f8a88d34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-14  Andreas Schwab  <schwab@suse.de>
+
+	* locale/C-address.c (_nl_C_LC_ADDRESS): Set country_num to zero
+	word instead of empty string.
+
 2013-11-13  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c
diff --git a/locale/C-address.c b/locale/C-address.c
index 060a956f36..fe6e69e8ba 100644
--- a/locale/C-address.c
+++ b/locale/C-address.c
@@ -38,7 +38,7 @@ const struct __locale_data _nl_C_LC_ADDRESS attribute_hidden =
     { .string = "" },
     { .string = "" },
     { .string = "" },
-    { .string = "" },
+    { .word = 0 },
     { .string = "" },
     { .string = "" },
     { .string = "" },