Update.

	* locale/langinfo.h: Remove _NL_MONETARY prefix from descriptors for
	new standard elements.
	* locale/categories.def: Adjust accordingly.

diff --git a/ChangeLog b/ChangeLog
index 7eba2803eabd0e1b00b98e530bd04fc0de5464a2..5d8b77666628cc74988e519b53b4299f4e0e2442 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
        * locale/locale.h (struct lconv): Add new elements from ISO C99.
        * locale/localeconv.c: Initialize new elements from ISO C99.
+       * locale/langinfo.h: Remove _NL_MONETARY prefix from descriptors for
+       new standard elements.
+       * locale/categories.def: Adjust accordingly.
 
        * iconv/iconv.h (iconv): Remove const from inbuf parameter.
        * iconv/iconv.c: Likewise.

diff --git a/locale/categories.def b/locale/categories.def
index e055d74a747274c9f0199e6661b52da38ef01cf0..b02c1cac582736f53b0f4c893f2874e2325edda6 100644 (file)
--- a/locale/categories.def
+++ b/locale/categories.def
@@ -1,5 +1,5 @@
 /* Definition of all available locale categories and their items.  -*- C -*-
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
 
    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
@@ -102,12 +102,12 @@ DEFINE_CATEGORY
   DEFINE_ELEMENT (N_SEP_BY_SPACE,                      "n_sep_by_space",         std, byte, 0, 2)
   DEFINE_ELEMENT (P_SIGN_POSN,                         "p_sign_posn",            std, byte, 0, 4)
   DEFINE_ELEMENT (N_SIGN_POSN,                         "n_sign_posn",            std, byte, 0, 4)
-  DEFINE_ELEMENT (_NL_MONETARY_INT_P_CS_PRECEDES,      "int_p_cs_precedes",      std, byte, 0, 1)
-  DEFINE_ELEMENT (_NL_MONETARY_INT_P_SEP_BY_SPACE,     "int_p_sep_by_space",     std, byte, 0, 2)
-  DEFINE_ELEMENT (_NL_MONETARY_INT_N_CS_PRECEDES,      "int_n_cs_precedes",      std, byte, 0, 1)
-  DEFINE_ELEMENT (_NL_MONETARY_INT_N_SEP_BY_SPACE,     "int_n_sep_by_space",     std, byte, 0, 2)
-  DEFINE_ELEMENT (_NL_MONETARY_INT_P_SIGN_POSN,        "int_p_sign_posn",        std, byte, 0, 4)
-  DEFINE_ELEMENT (_NL_MONETARY_INT_N_SIGN_POSN,        "int_n_sign_posn",        std, byte, 0, 4)
+  DEFINE_ELEMENT (__INT_P_CS_PRECEDES,                 "int_p_cs_precedes",      std, byte, 0, 1)
+  DEFINE_ELEMENT (__INT_P_SEP_BY_SPACE,                "int_p_sep_by_space",     std, byte, 0, 2)
+  DEFINE_ELEMENT (__INT_N_CS_PRECEDES,                 "int_n_cs_precedes",      std, byte, 0, 1)
+  DEFINE_ELEMENT (__INT_N_SEP_BY_SPACE,                "int_n_sep_by_space",     std, byte, 0, 2)
+  DEFINE_ELEMENT (__INT_P_SIGN_POSN,                   "int_p_sign_posn",        std, byte, 0, 4)
+  DEFINE_ELEMENT (__INT_N_SIGN_POSN,                   "int_n_sign_posn",        std, byte, 0, 4)
   DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_CURR_SYMBOL,    "duo_int_curr_symbol",    std, string)
   DEFINE_ELEMENT (_NL_MONETARY_DUO_CURRENCY_SYMBOL,    "duo_currency_symbol",    std, string)
   DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_FRAC_DIGITS,    "duo_int_frac_digits",    std, byte)

diff --git a/locale/langinfo.h b/locale/langinfo.h
index 7203c5d5ee00ae0308c2d43eb1b716fe4587a9b0..7d1183434ac04f8c5ff7c5f4659a209d71ec381d 100644 (file)
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -386,12 +386,30 @@ enum
 #ifdef __USE_XOPEN
 # define CRNCYSTR              __CRNCYSTR
 #endif
-  _NL_MONETARY_INT_P_CS_PRECEDES,
-  _NL_MONETARY_INT_P_SEP_BY_SPACE,
-  _NL_MONETARY_INT_N_CS_PRECEDES,
-  _NL_MONETARY_INT_N_SEP_BY_SPACE,
-  _NL_MONETARY_INT_P_SIGN_POSN,
-  _NL_MONETARY_INT_N_SIGN_POSN,
+  __INT_P_CS_PRECEDES,
+#ifdef __USE_GNU
+# define INT_P_CS_PRECEDES     __INT_P_CS_PRECEDES
+#endif
+  __INT_P_SEP_BY_SPACE,
+#ifdef __USE_GNU
+# define INT_P_SEP_BY_SPACE    __INT_P_SEP_BY_SPACE
+#endif
+  __INT_N_CS_PRECEDES,
+#ifdef __USE_GNU
+# define INT_N_CS_PRECEDES     __INT_N_CS_PRECEDES
+#endif
+  __INT_N_SEP_BY_SPACE,
+#ifdef __USE_GNU
+# define INT_N_SEP_BY_SPACE    __INT_N_SEP_BY_SPACE
+#endif
+  __INT_P_SIGN_POSN,
+#ifdef __USE_GNU
+# define INT_P_SIGN_POSN       __INT_P_SIGN_POSN
+#endif
+  __INT_N_SIGN_POSN,
+#ifdef __USE_GNU
+# define INT_N_SIGN_POSN       __INT_N_SIGN_POSN
+#endif
   _NL_MONETARY_DUO_INT_CURR_SYMBOL,
   _NL_MONETARY_DUO_CURRENCY_SYMBOL,
   _NL_MONETARY_DUO_INT_FRAC_DIGITS,