Add extern "C" { ... }.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index fbc7086cd651e5def850e1d40ee95b53cd1f4216..54da418d5f246b6c20de8f851ed85f046f9b2494 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -38,14 +38,21 @@
        * format.h: Likewise.
        * message.h: Likewise.
        * msgl-ascii.h: Likewise.
+       * msgl-cat.h: Likewise.
+       * msgl-charset.h: Likewise.
+       * msgl-english.h: Likewise.
+       * msgl-equal.h: Likewise.
        * msgl-iconv.h: Likewise.
        * open-po.h: Likewise.
        * po-charset.h: Likewise.
+       * po-lex.h: Likewise.
        * po-time.h: Likewise.
        * read-po-abstract.h: Likewise.
        * str-list.h: Likewise.
        * write-po.h: Likewise.
        * xgettext.h: Likewise.
+       * read-po.h: Likewise.
+       (this): Redefine to a different symbol.
        * xgettext.c: Add extern "C" around all "x-*.h" includes.
 
 2003-08-22  Bruno Haible  <bruno@clisp.org>

diff --git a/gettext-tools/src/msgl-cat.h b/gettext-tools/src/msgl-cat.h
index 7b6f9747752b0bdb4ec6439bc69439f02c0fa4ad..abdc56495603758cbad55c46e494ec78dc20eb05 100644 (file)
--- a/gettext-tools/src/msgl-cat.h
+++ b/gettext-tools/src/msgl-cat.h
@@ -1,5 +1,5 @@
 /* Message list concatenation and duplicate handling.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 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
@@ -19,10 +19,16 @@
 #ifndef _MSGL_CAT_H
 #define _MSGL_CAT_H
 
+#include <stdbool.h>
+
 #include "message.h"
 #include "str-list.h"
 
-#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 /* These variables control which messages are selected.  */
 extern int more_than;
@@ -44,4 +50,10 @@ extern msgdomain_list_ty *
        catenate_msgdomain_list (string_list_ty *file_list,
                                const char *to_code);
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _MSGL_CAT_H */

diff --git a/gettext-tools/src/msgl-charset.h b/gettext-tools/src/msgl-charset.h
index 7fe28b3855798e534c293a6f911fb77c3440353a..75ded5862d94a0d811f2e34fb36ac08d600cff2a 100644 (file)
--- a/gettext-tools/src/msgl-charset.h
+++ b/gettext-tools/src/msgl-charset.h
@@ -1,5 +1,5 @@
 /* Message list charset and locale charset handling.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 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
@@ -21,7 +21,19 @@
 
 #include "message.h"
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 extern void
        compare_po_locale_charsets (const msgdomain_list_ty *mdlp);
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _MSGL_CHARSET_H */

diff --git a/gettext-tools/src/msgl-english.h b/gettext-tools/src/msgl-english.h
index c3f1128f28c6f4a69bb94844266994e1c4211b62..19c80a5f31f3f57f2c1b8fd5fe87c09906791186 100644 (file)
--- a/gettext-tools/src/msgl-english.h
+++ b/gettext-tools/src/msgl-english.h
@@ -1,5 +1,5 @@
 /* Message translation initialization for English.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 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
@@ -21,7 +21,19 @@
 
 #include "message.h"
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 extern msgdomain_list_ty *
        msgdomain_list_english (msgdomain_list_ty *mdlp);
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _MSGL_ENGLISH_H */

diff --git a/gettext-tools/src/msgl-equal.h b/gettext-tools/src/msgl-equal.h
index 5eafa00ef4260452c2221f8579f003a49165c1b3..1db2d2c41a01b4c09f8d0d4c808fa57ce478bf98 100644 (file)
--- a/gettext-tools/src/msgl-equal.h
+++ b/gettext-tools/src/msgl-equal.h
@@ -1,5 +1,5 @@
 /* Message list test for equality.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 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
@@ -19,9 +19,15 @@
 #ifndef _MSGL_EQUAL_H
 #define _MSGL_EQUAL_H
 
+#include <stdbool.h>
+
 #include "message.h"
 
-#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 extern bool
        string_list_equal (const string_list_ty *slp1,
@@ -42,4 +48,10 @@ extern bool
                             const msgdomain_list_ty *mdlp2,
                             bool ignore_potcdate);
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _MSGL_EQUAL_H */

diff --git a/gettext-tools/src/po-lex.h b/gettext-tools/src/po-lex.h
index ce85bf3fefc485c4b0a9037f5a7d9ef152a30715..c9e0aafc2d45fa7ee552a4a5caa9abdbfd2fbb78 100644 (file)
--- a/gettext-tools/src/po-lex.h
+++ b/gettext-tools/src/po-lex.h
@@ -28,6 +28,12 @@
 #include "pos.h"
 #include "xerror.h"
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* Lexical analyzer for reading PO files.  */
 
 
@@ -149,4 +155,10 @@ struct msgstr_def
   size_t msgstr_len;
 };
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif

diff --git a/gettext-tools/src/read-po.h b/gettext-tools/src/read-po.h
index ce5c3e366abbe83d16c51217954192405b0ab406..f40163e75bfa0aa16e7394f2379066fa4f8d83be 100644 (file)
--- a/gettext-tools/src/read-po.h
+++ b/gettext-tools/src/read-po.h
@@ -1,5 +1,5 @@
 /* Reading PO files.
-   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
    This file was written by Bruno Haible <haible@clisp.cons.org>.
 
    This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,17 @@
 #include <stdbool.h>
 #include <stdio.h>
 
+
+/* For including this file in C++ mode.  */
+#ifdef __cplusplus
+# define this thiss
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* The following pair of structures cooperate to create a derived class from
    class abstract_po_reader_ty.  (See read-po-abstract.h for an explanation.)
    It implements the default behaviour of reading a PO file and converting it
@@ -160,4 +171,10 @@ extern msgdomain_list_ty *read_po (FILE *fp, const char *real_filename,
    a list of messages.  */
 extern msgdomain_list_ty *read_po_file (const char *input_name);
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _READ_PO_H */