Merge with glibc: rename germanic_plural.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index d34bdfa3801a843256805cdb1da2d64197950a0b..009851740c1ff69926abd26874131aab0c1f72e2 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-22  Bruno Haible  <bruno@clisp.org>
+
+       * plural-exp.h (GERMANIC_PLURAL): New declaration.
+       * plural-exp.c (GERMANIC_PLURAL): Renamed from germanic_plural.
+       * loadmsgcat.c (_nl_unload_domain): Update.
+
 2001-07-17  Ulrich Drepper  <drepper@redhat.com>
 
        * localealias.c (read_alias_file): Disable implicit locking

diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index dcf307c48e36fa1465869777c7be429a1ee7b80c..c7c10b249348cfd9601d247dd4ef8b1c755205f6 100644 (file)
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -426,7 +426,7 @@ internal_function
 _nl_unload_domain (domain)
      struct loaded_domain *domain;
 {
-  if (domain->plural != &germanic_plural)
+  if (domain->plural != &__gettext_germanic_plural)
     __gettext_free_exp (domain->plural);
 
   _nl_free_domain_conv (domain);

diff --git a/intl/plural-exp.c b/intl/plural-exp.c
index 06482991bea1f930df864054967e9389693d3df2..c937c011ac5d1e611cd1ebc2c1fe64f3081d9dca 100644 (file)
--- a/intl/plural-exp.c
+++ b/intl/plural-exp.c
@@ -46,7 +46,7 @@ static const struct expression plone =
     .num = 1
   }
 };
-static struct expression germanic_plural =
+struct expression GERMANIC_PLURAL =
 {
   .nargs = 2,
   .operation = not_equal,
@@ -69,7 +69,7 @@ static struct expression germanic_plural =
 
 static struct expression plvar;
 static struct expression plone;
-static struct expression germanic_plural;
+struct expression GERMANIC_PLURAL;
 
 static void
 init_germanic_plural ()
@@ -83,10 +83,10 @@ init_germanic_plural ()
       plone.operation = num;
       plone.val.num = 1;
 
-      germanic_plural.nargs = 2;
-      germanic_plural.operation = not_equal;
-      germanic_plural.val.args[0] = &plvar;
-      germanic_plural.val.args[1] = &plone;
+      GERMANIC_PLURAL.nargs = 2;
+      GERMANIC_PLURAL.operation = not_equal;
+      GERMANIC_PLURAL.val.args[0] = &plvar;
+      GERMANIC_PLURAL.val.args[1] = &plone;
     }
 }
 
@@ -150,7 +150,7 @@ EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp)
          English is using since English is a Germanic language.  */
     no_plural:
       INIT_GERMANIC_PLURAL ();
-      *pluralp = &germanic_plural;
+      *pluralp = &GERMANIC_PLURAL;
       *npluralsp = 2;
     }
 }

diff --git a/intl/plural-exp.h b/intl/plural-exp.h
index a4b8e965d2625c036e1db676094e27c9d5a778e7..6422b9b85942656e92477533960182cf8091cd5d 100644 (file)
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -91,16 +91,19 @@ struct parse_args
 #ifdef _LIBC
 # define FREE_EXPRESSION __gettext_free_exp
 # define PLURAL_PARSE __gettextparse
+# define GERMANIC_PLURAL __gettext_germanic_plural
 # define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
 # define PLURAL_EVAL __gettext_plural_eval
 #elif defined (IN_LIBINTL)
 # define FREE_EXPRESSION gettext_free_exp__
 # define PLURAL_PARSE gettextparse__
+# define GERMANIC_PLURAL gettext_germanic_plural__
 # define EXTRACT_PLURAL_EXPRESSION gettext_extract_plural__
 # define PLURAL_EVAL gettext_plural_eval__
 #else
 # define FREE_EXPRESSION free_plural_expression
 # define PLURAL_PARSE parse_plural_expression
+# define GERMANIC_PLURAL germanic_plural
 # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
 # define PLURAL_EVAL plural_eval
 #endif
@@ -108,6 +111,7 @@ struct parse_args
 extern void FREE_EXPRESSION PARAMS ((struct expression *exp))
      internal_function;
 extern int PLURAL_PARSE PARAMS ((void *arg));
+extern struct expression GERMANIC_PLURAL;
 extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry,
                                               struct expression **pluralp,
                                               unsigned long int *npluralsp))