Update.

	* locale/programs/ld-address.c (INT_STR_ELEM): Correct test for
	unknown character.

diff --git a/ChangeLog b/ChangeLog
index 249fd8e..b98e41f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-25  Ulrich Drepper  <drepper@redhat.com>
 
+       * locale/programs/ld-address.c (INT_STR_ELEM): Correct test for
+       unknown character.
+
        * locale/programs/ld-collate.c: Correct handling of different
        collation sections.
        * locale/programs/localedef.c (add_to_readlist): Take locale pointer

diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c
index d440b36..e35305d 100644 (file)
--- a/locale/programs/ld-address.c
+++ b/locale/programs/ld-address.c
@@ -520,7 +520,8 @@ address_read (struct linereader *ldfile, struct localedef_t *result,
          if (address->cat != NULL)                                           \
            lr_error (ldfile, _("\
 %s: field `%s' declared more than once"), "LC_ADDRESS", #cat);               \
-         else if (!ignore_content && arg->val.str.startmb == NULL)           \
+         else if (!ignore_content && arg->tok == tok_string                  \
+                  && arg->val.str.startmb == NULL)                           \
            {                                                                 \
              lr_error (ldfile, _("\
 %s: unknown character in field `%s'"), "LC_ADDRESS", #cat);                  \