Portability to Solaris cc.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index b4ebe3a5912a6f8399f32c7aa2b41ae0069efc12..0124ef1cc509881224197af51bf419d2c534b6f0 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-20  Bruno Haible  <bruno@clisp.org>
+
+       Portability to Solaris with cc.
+       * x-java.c (string_buffer_append): Avoid aggregate initializer
+       containing non-constant expressions.
+       * xgettext.c (flag_context_list_iterator): Likewise.
+       (language_to_extractor): Likewise.
+
 2003-10-11  Bruno Haible  <bruno@clisp.org>
 
        * xgettext.c (main): Drop suffix ".in" from input file name, if

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index abfcd02c24b579f99f28524d86a1106908ce3a36..0ab44b95998cf294a0b97e562a443ab380de5a79 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -1014,8 +1014,10 @@ flag_context_list_iterator_ty passthrough_context_list_iterator =
 flag_context_list_iterator_ty
 flag_context_list_iterator (flag_context_list_ty *list)
 {
-  flag_context_list_iterator_ty result = { 1, list };
+  flag_context_list_iterator_ty result;
 
+  result.argnum = 1;
+  result.head = list;
   return result;
 }
 
@@ -2047,12 +2049,12 @@ language_to_extractor (const char *name)
   for (tp = table; tp < ENDOF(table); ++tp)
     if (strcasecmp (name, tp->name) == 0)
       {
-       extractor_ty result =
-         {
-           tp->func,
-           tp->flag_table,
-           tp->formatstring_parser1, tp->formatstring_parser2
-         };
+       extractor_ty result;
+
+       result.func = tp->func;
+       result.flag_table = tp->flag_table;
+       result.formatstring_parser1 = tp->formatstring_parser1;
+       result.formatstring_parser2 = tp->formatstring_parser2;
 
        return result;
       }