From: Bruno Haible Date: Mon, 30 Oct 2006 12:31:40 +0000 (+0000) Subject: Make the x-*.h files real specification headers. X-Git-Tag: v0.17~692 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58197c3268a119eb48bcd1ec0363f7b94f804a24;p=thirdparty%2Fgettext.git Make the x-*.h files real specification headers. --- diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 0115b9443..3ddacf60c 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,45 @@ +2006-10-29 Bruno Haible + + * 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 * 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 50d74993d..c1ff24f15 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-awk.h b/gettext-tools/src/x-awk.h index a93725017..0ba501383 100644 --- 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 , 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 + +#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 cacc7739c..276a7b1d1 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-c.h b/gettext-tools/src/x-c.h index f4a8b065f..85367b59e 100644 --- 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 , 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 + +#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 d774d6dc7..ab7ed1ba8 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-csharp.h b/gettext-tools/src/x-csharp.h index f9225a130..589d83a7d 100644 --- 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 , 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 + +#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 43f71805f..d47a2af42 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-elisp.h b/gettext-tools/src/x-elisp.h index f29d0ca01..b5b33aeca 100644 --- 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 , 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 + +#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 bc7642104..76ef51046 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-glade.h b/gettext-tools/src/x-glade.h index 1e01a64cb..257b1b13e 100644 --- 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 , 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 + +#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 34064d498..ae122c6be 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-java.h b/gettext-tools/src/x-java.h index 1d34ba8dc..18abf9b4f 100644 --- 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 , 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 + +#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 816151658..f10b84506 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-librep.h b/gettext-tools/src/x-librep.h index 391fb1bb5..b6a4319ff 100644 --- 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 , 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 + +#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 16309301a..40460106e 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-lisp.h b/gettext-tools/src/x-lisp.h index 20a939bd9..8c9e8f9cc 100644 --- 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 , 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 + +#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 c929b9c5d..4cb058bb0 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-perl.h b/gettext-tools/src/x-perl.h index 5056ed0e5..cdbc41101 100644 --- 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 , 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 + +#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 29094a2e1..2cb046500 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-php.h b/gettext-tools/src/x-php.h index d8ade6556..f29559105 100644 --- 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 , 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 + +#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 a33490eef..7f980a943 100644 --- a/gettext-tools/src/x-po.c +++ b/gettext-tools/src/x-po.c @@ -21,6 +21,11 @@ # include #endif +/* Specification. */ +#include "x-po.h" +#include "x-properties.h" +#include "x-stringtable.h" + #include #include #include diff --git a/gettext-tools/src/x-po.h b/gettext-tools/src/x-po.h index 593878936..0c6c6b97f 100644 --- 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 , 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 + +#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 66f7fbd12..8ec4ae3ea 100644 --- 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 , 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 + +#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 4e0c45929..325f7503b 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-python.h b/gettext-tools/src/x-python.h index a6bc6dfbc..23518c3a2 100644 --- 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 , 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 + +#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 a252bdc07..b593cf1e3 100644 --- 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 , 2001. @@ -21,6 +21,9 @@ # include "config.h" #endif +/* Specification. */ +#include "x-rst.h" + #include #include #include diff --git a/gettext-tools/src/x-rst.h b/gettext-tools/src/x-rst.h index 82669f234..9ba5a1fc9 100644 --- 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 , 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 + +#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 950463c34..6b7641d5b 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-scheme.h b/gettext-tools/src/x-scheme.h index 6a13e06a5..344295ffd 100644 --- 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 , 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 + +#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 d8ba7d635..68c3d2820 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-sh.h b/gettext-tools/src/x-sh.h index 789733545..bca63df39 100644 --- 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 , 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 + +#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 48050199b..0f759d2a1 100644 --- 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 , 2002. @@ -21,6 +21,9 @@ # include "config.h" #endif +/* Specification. */ +#include "x-smalltalk.h" + #include #include #include diff --git a/gettext-tools/src/x-smalltalk.h b/gettext-tools/src/x-smalltalk.h index 48feff47e..73a3aa338 100644 --- 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 , 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 + +#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 b0efda675..9ad7c5b6b 100644 --- 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 , 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 + +#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 301467b2f..9e09a06f8 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-tcl.h b/gettext-tools/src/x-tcl.h index 28e3bcf9f..1ea300f16 100644 --- 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 , 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 + +#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 57fc91f19..6707597ef 100644 --- 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 #include #include diff --git a/gettext-tools/src/x-ycp.h b/gettext-tools/src/x-ycp.h index d4d8add74..636705b9e 100644 --- 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 , 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 + +#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 48f96435f..7157f832f 100644 --- 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;