From: Bruno Haible <bruno@clisp.org>
Date: Mon, 22 Sep 2003 09:55:22 +0000 (+0000)
Subject: Avoid gcc warnings.
X-Git-Tag: v0.13~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17c3cd7f9f858bfa704e1958d720c25fd1426050;p=thirdparty%2Fgettext.git

Avoid gcc warnings.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index a7fc053f5..ddcd69162 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-14  Bruno Haible  <bruno@clisp.org>
+
+	* plural-count.c: Include plural-count.h.
+	* x-po.c: Include x-properties.h.
+	* x-java.l (append_strings): Change argument type to 'const char *'.
+
 2003-09-14  Bruno Haible  <bruno@clisp.org>
 
 	* msgfmt.c (check_plural_eval): Mark some strings as c-format.
diff --git a/gettext-tools/src/plural-count.c b/gettext-tools/src/plural-count.c
index 9b65a3645..0eb5f6a83 100644
--- a/gettext-tools/src/plural-count.c
+++ b/gettext-tools/src/plural-count.c
@@ -20,8 +20,10 @@
 # include <config.h>
 #endif
 
-#include "plural-exp.h"
+/* Specification.  */
+#include "plural-count.h"
 
+#include "plural-exp.h"
 
 /* Extract the number of plural forms from a header entry.  */
 
diff --git a/gettext-tools/src/x-java.l b/gettext-tools/src/x-java.l
index dee61a2f4..7d13280f9 100644
--- a/gettext-tools/src/x-java.l
+++ b/gettext-tools/src/x-java.l
@@ -221,7 +221,7 @@ ID [a-zA-Z_][a-zA-Z0-9_]*
 %%
 
 static char *
-append_strings (char *a, char *b)
+append_strings (char *a, const char *b)
 {
   int total_size = strlen (a) + strlen (b) + 1;
   char *new_string = (char *) xmalloc (total_size);
diff --git a/gettext-tools/src/x-po.c b/gettext-tools/src/x-po.c
index 6cc89c78b..b51f6d564 100644
--- a/gettext-tools/src/x-po.c
+++ b/gettext-tools/src/x-po.c
@@ -28,6 +28,7 @@
 
 #include "message.h"
 #include "x-po.h"
+#include "x-properties.h"
 #include "xgettext.h"
 #include "xmalloc.h"
 #include "read-po.h"