Clean up libgettextpo exports in C++ mode.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 463c7a2f0f98d9f1cc8d7aece5a852beb0478291..cee10c08c4daf8f40aefdead4abb91e47b6163e9 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-29  Bruno Haible  <bruno@clisp.org>
+
+       Clean up libgettextpo exports in C++ mode.
+       * po-gram.h: Wrap declarations in extern "C".
+
 2006-10-29  Bruno Haible  <bruno@clisp.org>
 
        Make it compile in C++ mode.

diff --git a/gettext-tools/src/po-gram.h b/gettext-tools/src/po-gram.h
index 2c0638bbc2aaecbe993563448868be9539f37ae5..f087929a6fb96f9baf295a1f85a884f146c9945a 100644 (file)
--- a/gettext-tools/src/po-gram.h
+++ b/gettext-tools/src/po-gram.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2002-2003, 2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -20,6 +20,14 @@
 #ifndef _PO_GRAM_H
 #define _PO_GRAM_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int po_gram_parse (void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 1ddfb6bf081be2ac79180688540b723481fcbe32..ff6c4ac1d16ff6ad234c06904fa30d9cde405b74 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-29  Bruno Haible  <bruno@clisp.org>
+
+       * lib/fstrcmp.h: Wrap declarations in extern "C".
+
 2006-10-29  Bruno Haible  <bruno@clisp.org>
 
        Make it compile in C++ mode.

diff --git a/gnulib-local/lib/fstrcmp.h b/gnulib-local/lib/fstrcmp.h
index e4dbe55c93433045d21072dbfb4c3fdb8005fc7c..4671c55d07168eeb2c30970e78f30007003ffa16 100644 (file)
--- a/gnulib-local/lib/fstrcmp.h
+++ b/gnulib-local/lib/fstrcmp.h
@@ -1,5 +1,5 @@
 /* Fuzzy string comparison.
-   Copyright (C) 1995, 2000, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2000, 2002-2003, 2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <pmiller@agso.gov.au>
 
@@ -20,8 +20,16 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 #ifndef _FSTRCMP_H
 #define _FSTRCMP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Fuzzy compare of S1 and S2.  Return a measure for the similarity of S1
    and S1.  The higher the result, the more similar the strings are.  */
 extern double fstrcmp (const char *s1, const char *s2);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif