From: Bruno Haible <bruno@clisp.org>
Date: Mon, 20 Oct 2003 20:28:25 +0000 (+0000)
Subject: Portability to Solaris cc.
X-Git-Tag: v0.13~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=439d1c2c87aa4b1bd1444ad105dc510a1f1f3fd4;p=thirdparty%2Fgettext.git

Portability to Solaris cc.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index b4ebe3a59..0124ef1cc 100644
--- 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 abfcd02c2..0ab44b959 100644
--- 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;
       }