Adapt to changed prototype of extract_plural_expression.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 41d8da8b3d20bf9cb614fe8438dd90314adc1b40..e94ba3e5cdf7557fcbedcb653fbc0047bfff2d05 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-18  Bruno Haible  <bruno@clisp.org>
+
+       * plural-count.c (get_plural_count): Adapt to changed prototype of
+       extract_plural_expression.
+       * write-csharp.c (write_csharp_expression): Add const to parameter.
+       (write_csharp_code): Adapt to changed prototype of
+       extract_plural_expression.
+       * write-java.c (write_java_expression): Add const to parameter.
+       (write_java_code): Adapt to changed prototype of
+       extract_plural_expression.
+
 2007-10-07  Bruno Haible  <bruno@clisp.org>
 
        * hostname.c (main): In the --version output, say GPLv3+.

diff --git a/gettext-tools/src/plural-count.c b/gettext-tools/src/plural-count.c
index 440a65eaee88ceb5d834e50fb5f8cdbdecf0505a..3fd8838d162460897ba199fc40b83d5685753c02 100644 (file)
--- a/gettext-tools/src/plural-count.c
+++ b/gettext-tools/src/plural-count.c
@@ -1,5 +1,5 @@
 /* Plural form count.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 unsigned long int
 get_plural_count (const char *header)
 {
-  struct expression *plural;
+  const struct expression *plural;
   unsigned long int nplurals;
 
   extract_plural_expression (header, &plural, &nplurals);

diff --git a/gettext-tools/src/write-csharp.c b/gettext-tools/src/write-csharp.c
index c4146e467bade92c41d7be4f35802a5780960367..134af03847c8b1e80843830abeb0ff75cc29f970 100644 (file)
--- a/gettext-tools/src/write-csharp.c
+++ b/gettext-tools/src/write-csharp.c
@@ -315,7 +315,7 @@ is_expression_boolean (struct expression *exp)
 /* Write C# code that evaluates a plural expression according to the C rules.
    The variable is called 'n'.  */
 static void
-write_csharp_expression (FILE *stream, struct expression *exp, bool as_boolean)
+write_csharp_expression (FILE *stream, const struct expression *exp, bool as_boolean)
 {
   /* We use parentheses everywhere.  This frees us from tracking the priority
      of arithmetic operators.  */
@@ -581,7 +581,7 @@ write_csharp_code (FILE *stream, const char *culture_name, const char *class_nam
   if (plurals)
     {
       message_ty *header_entry;
-      struct expression *plural;
+      const struct expression *plural;
       unsigned long int nplurals;
 
       header_entry = message_list_search (mlp, NULL, "");

diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c
index 0924bd1b182fcf5ee5e54530777495e57a65e56a..5c3e5e95f4b54145a8aa42e9f3d38686c4dd05c4 100644 (file)
--- a/gettext-tools/src/write-java.c
+++ b/gettext-tools/src/write-java.c
@@ -536,7 +536,7 @@ is_expression_boolean (struct expression *exp)
 /* Write Java code that evaluates a plural expression according to the C rules.
    The variable is called 'n'.  */
 static void
-write_java_expression (FILE *stream, struct expression *exp, bool as_boolean)
+write_java_expression (FILE *stream, const struct expression *exp, bool as_boolean)
 {
   /* We use parentheses everywhere.  This frees us from tracking the priority
      of arithmetic operators.  */
@@ -912,7 +912,7 @@ write_java_code (FILE *stream, const char *class_name, message_list_ty *mlp,
   if (plurals)
     {
       message_ty *header_entry;
-      struct expression *plural;
+      const struct expression *plural;
       unsigned long int nplurals;
 
       header_entry = message_list_search (mlp, NULL, "");