* intl/plural-exp.c (GERMANIC_PLURAL): Mark as const.

	* intl/plural-exp.h: Adjust declaration of
	__gettext_germanic_plural.

diff --git a/ChangeLog b/ChangeLog
index 572b690..829b9ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-12-20  Ulrich Drepper  <drepper@redhat.com>
 
+       * intl/plural-exp.c (GERMANIC_PLURAL): Mark as const.
+       * intl/plural-exp.h: Adjust declaration of
+       __gettext_germanic_plural.
+
        * resolv/herror.c (h_errlist): Mark as const.
        (h_nerr): Likewise.
 

diff --git a/intl/plural-exp.c b/intl/plural-exp.c
index ba5d455..9cb7a45 100644 (file)
--- a/intl/plural-exp.c
+++ b/intl/plural-exp.c
@@ -1,5 +1,5 @@
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
    This file is part of the GNU C Library.
 
@@ -47,7 +47,7 @@ static const struct expression plone =
     .num = 1
   }
 };
-struct expression GERMANIC_PLURAL =
+const struct expression GERMANIC_PLURAL =
 {
   .nargs = 2,
   .operation = not_equal,

diff --git a/intl/plural-exp.h b/intl/plural-exp.h
index 75c702f..f8a5c87 100644 (file)
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -1,5 +1,5 @@
 /* Expression parsing and evaluation for plural form selection.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
    This file is part of the GNU C Library.
 
@@ -113,7 +113,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 attribute_hidden;
+extern const struct expression GERMANIC_PLURAL attribute_hidden;
 extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry,
                                               struct expression **pluralp,
                                               unsigned long int *npluralsp))