Make the x-*.h files real specification headers.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 0115b9443a7783f47501f2fbe3ed0a69ae631f89..3ddacf60c53f776ae71c71faaa6aa06107008f03 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,45 @@
+2006-10-29  Bruno Haible  <bruno@clisp.org>
+
+       * x-awk.h: Make includable without prerequisites.
+       * x-c.h: Likewise.
+       * x-csharp.h: Likewise.
+       * x-elisp.h: Likewise.
+       * x-glade.h: Likewise.
+       * x-java.h: Likewise.
+       * x-librep.h: Likewise.
+       * x-lisp.h: Likewise.
+       * x-perl.h: Likewise.
+       * x-php.h: Likewise.
+       * x-po.h: Likewise.
+       * x-properties.h: Likewise.
+       * x-python.h: Likewise.
+       * x-rst.h: Likewise.
+       * x-scheme.h: Likewise.
+       * x-sh.h: Likewise.
+       * x-smalltalk.h: Likewise.
+       * x-stringtable.h: Likewise.
+       * x-tcl.h: Likewise.
+       * x-ycp.h: Likewise.
+       * x-awk.c: Include x-awk.h.
+       * x-c.c: Include x-c.h.
+       * x-csharp.c: Include x-csharp.h.
+       * x-elisp.c: Include x-elisp.h.
+       * x-glade.c: Include x-glade.h.
+       * x-java.c: Include x-java.h.
+       * x-librep.c: Include x-librep.h.
+       * x-lisp.c: Include x-lisp.h.
+       * x-perl.c: Include x-perl.h.
+       * x-php.c: Include x-php.h.
+       * x-po.c: Include x-po.h, x-properties.h, x-stringtable.h.
+       * x-python.c: Include x-python.h.
+       * x-rst.c: Include x-rst.h.
+       * x-scheme.c: Include x-scheme.h.
+       * x-sh.c: Include x-sh.h.
+       * x-smalltalk.c: Include x-smalltalk.h.
+       * x-tcl.c: Include x-tcl.h.
+       * x-ycp.c: Include x-ycp.h.
+       * xgettext.c: Remove extern "C" around x-*.h includes.
+
 2006-10-29  Bruno Haible  <bruno@clisp.org>
 
        * format-awk.c (format_parse): Fix bug with unnumbered argument in

diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c
index 50d74993d512e81625fa367f32e2beff8a2bbbfa..c1ff24f158b0aae19ace13398e1e3d42f58149ae 100644 (file)
--- a/gettext-tools/src/x-awk.c
+++ b/gettext-tools/src/x-awk.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-awk.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-awk.h b/gettext-tools/src/x-awk.h
index a93725017c7b00272156cbeb45ca1f5a3ccdbe8d..0ba5013836f1b57ab8ac0cc596d45ac1a5addb18 100644 (file)
--- a/gettext-tools/src/x-awk.h
+++ b/gettext-tools/src/x-awk.h
@@ -1,5 +1,5 @@
 /* xgettext awk backend.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_AWK \
   { "awk",    "awk"   },                                               \
 
@@ -34,3 +45,8 @@ extern void x_awk_keyword (const char *keyword);
 extern void x_awk_extract_all (void);
 
 extern void init_flag_table_awk (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index cacc7739c35f912b466925bb09c01503edb65eed..276a7b1d176ff819059cb9e5ccd9056fb65bde3c 100644 (file)
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-c.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-c.h b/gettext-tools/src/x-c.h
index f4a8b065f9a7725358c7928c0da3aa5a070954d0..85367b59e9f70124802152125bf6a4231c18e759 100644 (file)
--- a/gettext-tools/src/x-c.h
+++ b/gettext-tools/src/x-c.h
@@ -1,5 +1,5 @@
 /* xgettext C/C++/ObjectiveC backend.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_C \
   { "c",      "C"     },                                               \
   { "h",      "C"     },                                               \
@@ -64,3 +75,8 @@ extern void x_c_trigraphs (void);
 extern void init_flag_table_c (void);
 extern void init_flag_table_objc (void);
 extern void init_flag_table_gcc_internal (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c
index d774d6dc754bf661754999bf5e99c12c19d10e7c..ab7ed1ba86c5a6e4d50c93b2cb8045ce2cbaafe6 100644 (file)
--- a/gettext-tools/src/x-csharp.c
+++ b/gettext-tools/src/x-csharp.c
@@ -20,6 +20,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-csharp.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-csharp.h b/gettext-tools/src/x-csharp.h
index f9225a1303f7e907f52fed39434f915035ffa1c0..589d83a7d1437d5268f45b0fe1463144be14e2a7 100644 (file)
--- a/gettext-tools/src/x-csharp.h
+++ b/gettext-tools/src/x-csharp.h
@@ -1,5 +1,5 @@
 /* xgettext C# backend.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,18 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_CSHARP \
   { "cs",      "C#"  },                                                        \
 
@@ -32,3 +44,8 @@ extern void x_csharp_keyword (const char *keyword);
 extern void x_csharp_extract_all (void);
 
 extern void init_flag_table_csharp (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-elisp.c b/gettext-tools/src/x-elisp.c
index 43f71805f33aa2ac08433253a7dd80b767c33141..d47a2af4283cb6e51e0d3d3aab3f94238adf0063 100644 (file)
--- a/gettext-tools/src/x-elisp.c
+++ b/gettext-tools/src/x-elisp.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-elisp.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-elisp.h b/gettext-tools/src/x-elisp.h
index f29d0ca01dd44652083785e0e1cfd274ea2f9409..b5b33aeca356d0d4a88444099ebbda9a2f3956db 100644 (file)
--- a/gettext-tools/src/x-elisp.h
+++ b/gettext-tools/src/x-elisp.h
@@ -1,5 +1,5 @@
 /* xgettext Emacs Lisp backend.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_ELISP \
   { "el",        "EmacsLisp"     },                                    \
 
@@ -37,3 +48,8 @@ extern void x_elisp_extract_all (void);
 extern void x_elisp_keyword (const char *name);
 
 extern void init_flag_table_elisp (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-glade.c b/gettext-tools/src/x-glade.c
index bc76421044b332a93b51df21e9410dc46683a328..76ef51046ef6dad38983516855dd2b3fcb82c09d 100644 (file)
--- a/gettext-tools/src/x-glade.c
+++ b/gettext-tools/src/x-glade.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-glade.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-glade.h b/gettext-tools/src/x-glade.h
index 1e01a64cbbe8156726aa411e4ca66b9639b4e55f..257b1b13ef465502db69f82ee13e640a585c9443 100644 (file)
--- a/gettext-tools/src/x-glade.h
+++ b/gettext-tools/src/x-glade.h
@@ -1,5 +1,5 @@
 /* xgettext glade backend.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_GLADE \
   { "glade",     "glade"    },                                         \
   { "glade2",    "glade"    },                                         \
@@ -35,3 +46,8 @@ extern void extract_glade (FILE *fp, const char *real_filename,
 
 extern void x_glade_extract_all (void);
 extern void x_glade_keyword (const char *name);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c
index 34064d498e60d03c5d2e7eb90c1fe9b022a4291b..ae122c6be39b7b213e84fa3a3d1e01de2589c4ca 100644 (file)
--- a/gettext-tools/src/x-java.c
+++ b/gettext-tools/src/x-java.c
@@ -20,6 +20,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-java.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-java.h b/gettext-tools/src/x-java.h
index 1d34ba8dc0e91fdd2be6398e16ece35002034bd8..18abf9b4ff72c87414b030345b03eebd0042cbe8 100644 (file)
--- a/gettext-tools/src/x-java.h
+++ b/gettext-tools/src/x-java.h
@@ -1,5 +1,5 @@
 /* xgettext Java backend.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Tommy Johansson <tommy.johansson@kanalen.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,18 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_JAVA \
   { "java",    "Java"  },                                              \
 
@@ -32,3 +44,8 @@ extern void x_java_keyword (const char *keyword);
 extern void x_java_extract_all (void);
 
 extern void init_flag_table_java (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-librep.c b/gettext-tools/src/x-librep.c
index 816151658b5a38c49f5bc05f99a239e521e56809..f10b8450605870ba872dcdf3e281eb0ad1b40194 100644 (file)
--- a/gettext-tools/src/x-librep.c
+++ b/gettext-tools/src/x-librep.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-librep.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-librep.h b/gettext-tools/src/x-librep.h
index 391fb1bb5b8a41d50a88dafd647fb0da4ee07e7f..b6a4319ff2b50c248c105f05ccec8afd89c60f96 100644 (file)
--- a/gettext-tools/src/x-librep.h
+++ b/gettext-tools/src/x-librep.h
@@ -1,5 +1,5 @@
 /* xgettext librep backend.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_LIBREP \
   { "jl",        "librep"     },                                       \
 
@@ -37,3 +48,8 @@ extern void x_librep_extract_all (void);
 extern void x_librep_keyword (const char *name);
 
 extern void init_flag_table_librep (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-lisp.c b/gettext-tools/src/x-lisp.c
index 16309301a85b848561f13c57dfc9dcb1fc6afa47..40460106ef5b3c812ec4a2a3858dc546a5ae3f7e 100644 (file)
--- a/gettext-tools/src/x-lisp.c
+++ b/gettext-tools/src/x-lisp.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-lisp.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-lisp.h b/gettext-tools/src/x-lisp.h
index 20a939bd958bb1207238cc2722177952cc4ae74d..8c9e8f9ccb42d1d88065d8526928da25dd5731c5 100644 (file)
--- a/gettext-tools/src/x-lisp.h
+++ b/gettext-tools/src/x-lisp.h
@@ -1,5 +1,5 @@
 /* xgettext Lisp backend.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_LISP \
   { "lisp",      "Lisp"     },                                         \
 
@@ -37,3 +48,8 @@ extern void x_lisp_extract_all (void);
 extern void x_lisp_keyword (const char *name);
 
 extern void init_flag_table_lisp (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c
index c929b9c5d8b371846b1b9d56f8eb5c625bc725bd..4cb058bb02b6b40b531ff5f826c46b6be99eebbb 100644 (file)
--- a/gettext-tools/src/x-perl.c
+++ b/gettext-tools/src/x-perl.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-perl.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-perl.h b/gettext-tools/src/x-perl.h
index 5056ed0e5a9b83da264057869e056b6208ce365f..cdbc41101d962306a0cad762f376d849575c1a1b 100644 (file)
--- a/gettext-tools/src/x-perl.h
+++ b/gettext-tools/src/x-perl.h
@@ -1,5 +1,5 @@
 /* xgettext Perl backend.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Guido Flohr <guido@imperia.net>, 2002-2003
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_PERL \
   { "pl",    "perl"   },                                               \
   { "PL",    "perl"   },                                               \
@@ -37,3 +48,8 @@ extern void x_perl_keyword (const char *keyword);
 extern void x_perl_extract_all (void);
 
 extern void init_flag_table_perl (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
index 29094a2e1433dfa047735149561f9f64b2d0eb9b..2cb046500510f3e4b5bbf77d7733c19e69f60f43 100644 (file)
--- a/gettext-tools/src/x-php.c
+++ b/gettext-tools/src/x-php.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-php.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-php.h b/gettext-tools/src/x-php.h
index d8ade65562df3da8bd373e9f8a2f8d205bb8c2b9..f2955910590a7ba2a83b5e0da5bc672ecb97efb4 100644 (file)
--- a/gettext-tools/src/x-php.h
+++ b/gettext-tools/src/x-php.h
@@ -1,5 +1,5 @@
 /* xgettext PHP backend.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_PHP \
   { "php",    "PHP"   },                                               \
   { "php3",   "PHP"   },                                               \
@@ -36,3 +47,8 @@ extern void x_php_keyword (const char *keyword);
 extern void x_php_extract_all (void);
 
 extern void init_flag_table_php (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-po.c b/gettext-tools/src/x-po.c
index a33490eef9623cf3f91606e6eba4085a5d1039df..7f980a943ad7f2603995a4f0ede8f49cafab1cad 100644 (file)
--- a/gettext-tools/src/x-po.c
+++ b/gettext-tools/src/x-po.c
@@ -21,6 +21,11 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "x-po.h"
+#include "x-properties.h"
+#include "x-stringtable.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>

diff --git a/gettext-tools/src/x-po.h b/gettext-tools/src/x-po.h
index 593878936c8d57fab18ae608da07675582a97b74..0c6c6b97f0c817e0eb0a65ca1e6be4a141ab6914 100644 (file)
--- a/gettext-tools/src/x-po.h
+++ b/gettext-tools/src/x-po.h
@@ -1,5 +1,5 @@
 /* xgettext PO backend.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_PO \
   { "po",     "PO"    },                                               \
   { "pot",    "PO"    },                                               \
@@ -29,3 +40,8 @@ extern void extract_po (FILE *fp, const char *real_filename,
                        const char *logical_filename,
                        flag_context_list_table_ty *flag_table,
                        msgdomain_list_ty *mdlp);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-properties.h b/gettext-tools/src/x-properties.h
index 66f7fbd12c0f4549c63468bf59f7fa32a5519aa6..8ec4ae3ead1552dbb62a7ce5db5cf65f75efc6be 100644 (file)
--- a/gettext-tools/src/x-properties.h
+++ b/gettext-tools/src/x-properties.h
@@ -1,5 +1,5 @@
 /* xgettext JavaProperties backend.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_PROPERTIES \
   { "properties", "JavaProperties" },                                  \
 
@@ -28,3 +39,8 @@ extern void extract_properties (FILE *fp, const char *real_filename,
                                const char *logical_filename,
                                flag_context_list_table_ty *flag_table,
                                msgdomain_list_ty *mdlp);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index 4e0c45929660001387ae6df8add74bc9b01f723a..325f7503b59b891d67177d8d9971882d731af973 100644 (file)
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-python.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>

diff --git a/gettext-tools/src/x-python.h b/gettext-tools/src/x-python.h
index a6bc6dfbcb5cc2af55d15a6d09e5e6c9e66f5d2b..23518c3a20cac5a3bf72d82d4cacc9ed54c67244 100644 (file)
--- a/gettext-tools/src/x-python.h
+++ b/gettext-tools/src/x-python.h
@@ -1,5 +1,5 @@
 /* xgettext Python backend.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_PYTHON \
   { "py",        "Python"   },                                         \
 
@@ -34,3 +45,8 @@ extern void x_python_keyword (const char *keyword);
 extern void x_python_extract_all (void);
 
 extern void init_flag_table_python (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c
index a252bdc07213968207111d4aa9b2cfd12a4b671f..b593cf1e3df6293209a5eb60d1b70851091b5616 100644 (file)
--- a/gettext-tools/src/x-rst.c
+++ b/gettext-tools/src/x-rst.c
@@ -1,5 +1,5 @@
 /* xgettext RST backend.
-   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-rst.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stddef.h>

diff --git a/gettext-tools/src/x-rst.h b/gettext-tools/src/x-rst.h
index 82669f234044a7677f112ffde6db760b0f286b3a..9ba5a1fc92b183884f947780511251bdf15626d4 100644 (file)
--- a/gettext-tools/src/x-rst.h
+++ b/gettext-tools/src/x-rst.h
@@ -1,5 +1,5 @@
 /* xgettext RST backend.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_RST \
   { "rst",    "RST"   },                                               \
 
@@ -29,3 +40,8 @@ extern void extract_rst (FILE *fp, const char *real_filename,
                         const char *logical_filename,
                         flag_context_list_table_ty *flag_table,
                         msgdomain_list_ty *mdlp);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-scheme.c b/gettext-tools/src/x-scheme.c
index 950463c3468e66d7bcb65576e56401c0c73c073b..6b7641d5baa2745831eee02908fd2de373e218bd 100644 (file)
--- a/gettext-tools/src/x-scheme.c
+++ b/gettext-tools/src/x-scheme.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-scheme.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>

diff --git a/gettext-tools/src/x-scheme.h b/gettext-tools/src/x-scheme.h
index 6a13e06a55a4a8242e787a61615a22f8813cf8b3..344295ffd5ae60f1ae6a717e23f41d48a6beb5bd 100644 (file)
--- a/gettext-tools/src/x-scheme.h
+++ b/gettext-tools/src/x-scheme.h
@@ -1,5 +1,5 @@
 /* xgettext Scheme backend.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2004.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_SCHEME \
   { "scm",       "Scheme"     },                                       \
 
@@ -37,3 +48,8 @@ extern void x_scheme_extract_all (void);
 extern void x_scheme_keyword (const char *name);
 
 extern void init_flag_table_scheme (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-sh.c b/gettext-tools/src/x-sh.c
index d8ba7d635301a9f5f12aec80fe371e8119f55f4b..68c3d2820497bf4a5837dfea47b41f0345722257 100644 (file)
--- a/gettext-tools/src/x-sh.c
+++ b/gettext-tools/src/x-sh.c
@@ -20,6 +20,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-sh.h"
+
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>

diff --git a/gettext-tools/src/x-sh.h b/gettext-tools/src/x-sh.h
index 7897335457c1dd550f1200f74d2e3e81abe12450..bca63df39753c88e73720ebb5cfc9099b6fd7c92 100644 (file)
--- a/gettext-tools/src/x-sh.h
+++ b/gettext-tools/src/x-sh.h
@@ -1,5 +1,5 @@
 /* xgettext sh backend.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_SH \
   { "sh",    "Shell"   },                                              \
   { "bash",  "Shell"   },                                              \
@@ -35,3 +46,8 @@ extern void x_sh_keyword (const char *keyword);
 extern void x_sh_extract_all (void);
 
 extern void init_flag_table_sh (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-smalltalk.c b/gettext-tools/src/x-smalltalk.c
index 48050199bea3a65157adb0a77b0827a5bbb7baba..0f759d2a1ec1accbaa5d0f2eea9c8b7673fe233d 100644 (file)
--- a/gettext-tools/src/x-smalltalk.c
+++ b/gettext-tools/src/x-smalltalk.c
@@ -1,5 +1,5 @@
 /* xgettext Smalltalk backend.
-   Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2006 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-smalltalk.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/gettext-tools/src/x-smalltalk.h b/gettext-tools/src/x-smalltalk.h
index 48feff47e4ad5768ad67fcb842e3a8e949c268d8..73a3aa3382e6941b6fbb0d3537bb0a9e8756a5ee 100644 (file)
--- a/gettext-tools/src/x-smalltalk.h
+++ b/gettext-tools/src/x-smalltalk.h
@@ -1,5 +1,5 @@
 /* xgettext Smalltalk backend.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_SMALLTALK \
   { "st",     "Smalltalk"   },                                         \
 
@@ -29,3 +40,8 @@ extern void extract_smalltalk (FILE *fp, const char *real_filename,
                               const char *logical_filename,
                               flag_context_list_table_ty *flag_table,
                               msgdomain_list_ty *mdlp);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-stringtable.h b/gettext-tools/src/x-stringtable.h
index b0efda675d61d8b3f1bca098dc7cbe800166192c..9ad7c5b6b1280c1c39feb50993a319e47c440906 100644 (file)
--- a/gettext-tools/src/x-stringtable.h
+++ b/gettext-tools/src/x-stringtable.h
@@ -1,5 +1,5 @@
 /* xgettext NXStringTable backend.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_STRINGTABLE \
   { "strings", "NXStringTable" },                                      \
 
@@ -28,3 +39,8 @@ extern void extract_stringtable (FILE *fp, const char *real_filename,
                                 const char *logical_filename,
                                 flag_context_list_table_ty *flag_table,
                                 msgdomain_list_ty *mdlp);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-tcl.c b/gettext-tools/src/x-tcl.c
index 301467b2fc0aedac78a50c2b8158e234e3e38589..9e09a06f821d35862b4672cac9d3d4a3edd6d412 100644 (file)
--- a/gettext-tools/src/x-tcl.c
+++ b/gettext-tools/src/x-tcl.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-tcl.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>

diff --git a/gettext-tools/src/x-tcl.h b/gettext-tools/src/x-tcl.h
index 28e3bcf9fbd31b1c8a5a1f3eb6037e461b2fc47e..1ea300f1649f5f303f597b366820a75d88a3ea37 100644 (file)
--- a/gettext-tools/src/x-tcl.h
+++ b/gettext-tools/src/x-tcl.h
@@ -1,5 +1,5 @@
 /* xgettext Tcl Lisp backend.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_TCL \
   { "tcl",       "Tcl"           },                                    \
 
@@ -37,3 +48,8 @@ extern void x_tcl_extract_all (void);
 extern void x_tcl_keyword (const char *name);
 
 extern void init_flag_table_tcl (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/x-ycp.c b/gettext-tools/src/x-ycp.c
index 57fc91f19e887a6d2a4499c4a3fc2fc37fc5d48e..6707597ef0b32ee156e94891f74eeac77fcd02e2 100644 (file)
--- a/gettext-tools/src/x-ycp.c
+++ b/gettext-tools/src/x-ycp.c
@@ -21,6 +21,9 @@
 # include "config.h"
 #endif
 
+/* Specification.  */
+#include "x-ycp.h"
+
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>

diff --git a/gettext-tools/src/x-ycp.h b/gettext-tools/src/x-ycp.h
index d4d8add74a09942f02a34fb076a1060c3bd927ef..636705b9edfdaed34d625286b0f3fff97c11fd61 100644 (file)
--- a/gettext-tools/src/x-ycp.h
+++ b/gettext-tools/src/x-ycp.h
@@ -1,5 +1,5 @@
 /* xgettext YCP backend.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 
+#include <stdio.h>
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #define EXTENSIONS_YCP \
   { "ycp",    "YCP"   },                                               \
 
@@ -31,3 +42,8 @@ extern void extract_ycp (FILE *fp, const char *real_filename,
                         msgdomain_list_ty *mdlp);
 
 extern void init_flag_table_ycp (void);
+
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 48f96435f2d0860f32615323f9f0da67997b5a83..7157f832fe675c8ece752c1beb45bd65107f6c0a 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -71,10 +71,6 @@
 #define _(str) gettext (str)
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "x-c.h"
 #include "x-po.h"
 #include "x-sh.h"
@@ -96,10 +92,6 @@ extern "C" {
 #include "x-rst.h"
 #include "x-glade.h"
 
-#ifdef __cplusplus
-}
-#endif
-
 
 /* If nonzero add all comments immediately preceding one of the keywords. */
 static bool add_all_comments = false;