Refactor includes.

* gettext-tools/src/read-catalog-abstract.h: Include <stdio.h>. Don't include
po-lex.h.
* gettext-tools/src/read-catalog.c: Include po-lex.h.
* gettext-tools/src/msgcmp.c: Include po-lex.h.
* gettext-tools/src/msgfmt.c: Likewise.
* gettext-tools/src/msgmerge.c: Likewise.
* gettext-tools/src/xgettext.c: Likewise.
* gettext-tools/libgettextpo/gettext-po.c: Likewise.
* gettext-tools/src/x-po.c: Include <error.h>. Don't include po-lex.h.
* gettext-tools/src/read-desktop.h: Include pos.h. Don't include po-lex.h.
* gettext-tools/src/read-desktop.c: Don't include po-lex.h.

diff --git a/gettext-tools/libgettextpo/gettext-po.c b/gettext-tools/libgettextpo/gettext-po.c
index ffcb11d159e8862a37d269f68304a1d77196244f..397088006d99861aaabcce8b15849d03e3be5be3 100644 (file)
--- a/gettext-tools/libgettextpo/gettext-po.c
+++ b/gettext-tools/libgettextpo/gettext-po.c
@@ -48,6 +48,7 @@ static void (*orig_error_at_line) (int status, int errnum,
 #include "xalloc.h"
 #include "read-catalog.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "write-catalog.h"
 #include "write-po.h"
 #include "xerror.h"

diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c
index e9bf6fc8b8807e47c43170f577b2373589d378ea..ac56608943f305a27735dba086b679864a2aab7c 100644 (file)
--- a/gettext-tools/src/msgcmp.c
+++ b/gettext-tools/src/msgcmp.c
@@ -37,6 +37,7 @@
 #include "message.h"
 #include "read-catalog-file.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "read-properties.h"
 #include "read-stringtable.h"
 #include "xmalloca.h"

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 87eab26c0ab1e3cc0435c70fc9a140de2d894f04..a6ab145fc16b92019f82f1654dd5ca16797ce48e 100644 (file)
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -56,6 +56,7 @@
 #include "open-catalog.h"
 #include "read-catalog-file.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "read-properties.h"
 #include "read-stringtable.h"
 #include "read-desktop.h"

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 4980b2d820bc9aa7fa7868db075c03d86c1ed4d0..6349a7a3282e2145a29af00ffa107119fec5ee8e 100644 (file)
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -44,6 +44,7 @@
 #include "message.h"
 #include "read-catalog-file.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "read-properties.h"
 #include "read-stringtable.h"
 #include "write-catalog.h"

diff --git a/gettext-tools/src/read-catalog-abstract.h b/gettext-tools/src/read-catalog-abstract.h
index 2381f106aaae80cb42a3f7eb736b6f4f6b70319c..197bbe66624214f8e5b2aea55738f0dc2ffad970 100644 (file)
--- a/gettext-tools/src/read-catalog-abstract.h
+++ b/gettext-tools/src/read-catalog-abstract.h
@@ -19,10 +19,10 @@
 #ifndef _READ_CATALOG_ABSTRACT_H
 #define _READ_CATALOG_ABSTRACT_H
 
-#include "po-lex.h"
-#include "message.h"
-
 #include <stdbool.h>
+#include <stdio.h>
+
+#include "message.h"
 
 
 #ifdef __cplusplus

diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
index 0f8d065f31922964878e8715556240749bafc9fb..263f8354499c3034e15ecba887cfb4512bf24e18 100644 (file)
--- a/gettext-tools/src/read-catalog.c
+++ b/gettext-tools/src/read-catalog.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "po-charset.h"
+#include "po-lex.h"
 #include "po-xerror.h"
 #include "xalloc.h"
 #include "read-catalog-special.h"

diff --git a/gettext-tools/src/read-desktop.c b/gettext-tools/src/read-desktop.c
index 53978c3ff78f4d6de549d5f0ec6146731dedb9e5..a12c4bf2ea7bfb4d4dd2f17d507781e836819572 100644 (file)
--- a/gettext-tools/src/read-desktop.c
+++ b/gettext-tools/src/read-desktop.c
@@ -36,7 +36,6 @@
 #include "xalloc.h"
 #include "xvasprintf.h"
 #include "c-ctype.h"
-#include "po-lex.h"
 #include "po-xerror.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/read-desktop.h b/gettext-tools/src/read-desktop.h
index 6bda42bb0433dfa06e76ac4d283d9fae8217c395..8fc14db918b78ac0910706b80eefd7fc7362c37c 100644 (file)
--- a/gettext-tools/src/read-desktop.h
+++ b/gettext-tools/src/read-desktop.h
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include "mem-hash-map.h"
-#include "po-lex.h"
+#include "pos.h"
 #include "str-list.h"
 
 #ifdef __cplusplus
@@ -93,9 +93,9 @@ extern void desktop_reader_handle_group (desktop_reader_ty *reader,
 
 extern void desktop_reader_handle_pair (desktop_reader_ty *reader,
                                         lex_pos_ty *key_pos,
-                                 const char *key,
-                                 const char *locale,
-                                 const char *value);
+                                        const char *key,
+                                        const char *locale,
+                                        const char *value);
 
 extern void desktop_reader_handle_comment (desktop_reader_ty *reader,
                                            const char *s);

diff --git a/gettext-tools/src/x-po.c b/gettext-tools/src/x-po.c
index 89074da74ef7d443c594f3b05cb7332a12f52b07..c6140d030390fb3075b02307df6c82a97ff8e559 100644 (file)
--- a/gettext-tools/src/x-po.c
+++ b/gettext-tools/src/x-po.c
@@ -30,6 +30,7 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include <error.h>
 #include "message.h"
 #include "xgettext.h"
 #include "xalloc.h"
@@ -40,7 +41,6 @@
 #include "msgl-iconv.h"
 #include "msgl-ascii.h"
 #include "po-charset.h"
-#include "po-lex.h"
 #include "gettext.h"
 
 /* A convenience macro.  I don't like writing gettext() every time.  */

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index c470b334ba718d275d1370a57e231168509b2756..0c28dcd6d888a0228d61e840d2f2df742557583f 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -69,6 +69,7 @@
 #include "open-catalog.h"
 #include "read-catalog-abstract.h"
 #include "read-po.h"
+#include "po-lex.h"
 #include "message.h"
 #include "pos.h"
 #include "po-charset.h"