Avoid name mangling in C++ mode.

diff --git a/ChangeLog b/ChangeLog
index 3dc6ed03dec2a7f84321f91fa8d4fabb0012f739..17453822d92dc8ce86e305f155b17644789a14c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-03  Bruno Haible  <bruno@clisp.org>
+
+       * lib/c-ctype.h [C++]: Define functions without name mangling.
+       * lib/fwriteerror.h [C++]: Likewise.
+       * lib/gcd.h [C++]: Likewise.
+       * lib/linebreak.h [C++]: Likewise.
+
 2006-11-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/canonicalize.h: (canonicalize_mode_t, CAN_EXISTING):

diff --git a/lib/c-ctype.h b/lib/c-ctype.h
index 395c7a13611ff76fd71593565260e767b092a382..b26eccfb3d1df818013f7b62562cc20a393f9798 100644 (file)
--- a/lib/c-ctype.h
+++ b/lib/c-ctype.h
@@ -27,6 +27,11 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 #include <stdbool.h>
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* The functions defined in this file assume the "C" locale and a character
    set without diacritics (ASCII-US or EBCDIC-US or something like that).
    Even if the "C" locale on a particular system is an extension of the ASCII
@@ -267,4 +272,9 @@ extern int c_toupper (int c);
 
 #endif /* optimizing for speed */
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* C_CTYPE_H */

diff --git a/lib/fwriteerror.h b/lib/fwriteerror.h
index ebbe1be6c9db6b0a895028a55201d3e5e6e23c49..24d8e0ad4478ab3e0ab9d9f6be843873f257fe49 100644 (file)
--- a/lib/fwriteerror.h
+++ b/lib/fwriteerror.h
@@ -40,6 +40,10 @@
 
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Write out the not yet written buffered contents of the stream FP, close
    the stream FP, and test whether some error occurred on the stream FP.
    FP must be a stream opened for writing.
@@ -53,3 +57,7 @@ extern int fwriteerror (FILE *fp);
 /* Likewise, but don't consider it an error if FP has an invalid file
    descriptor and no output was done to FP.  */
 extern int fwriteerror_no_ebadf (FILE *fp);
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/lib/gcd.h b/lib/gcd.h
index 6fbaf824296f1801753172cbba932548e5f1fa14..cf2b7fd84c90d034dbdfb9542f7c4dc6f8d4d2db 100644 (file)
--- a/lib/gcd.h
+++ b/lib/gcd.h
@@ -1,5 +1,5 @@
 /* Arithmetic.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,17 @@
 #ifndef _GCD_H
 #define _GCD_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* Return the greatest common divisor of a > 0 and b > 0.  */
 extern unsigned long gcd (unsigned long a, unsigned long b);
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _GCD_H */

diff --git a/lib/linebreak.h b/lib/linebreak.h
index 56d8b1eb8aa99c652ae329d55db80f5d1eef8a9e..4a27aab1124b8db5ae8bd89d59ac4c5395bb1062 100644 (file)
--- a/lib/linebreak.h
+++ b/lib/linebreak.h
@@ -1,5 +1,5 @@
 /* linebreak.h - line breaking of Unicode strings
-   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
@@ -23,6 +23,11 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 #include <stddef.h>
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* Display width.  */
 
 /* These functions are locale dependent.  The encoding argument identifies
@@ -100,4 +105,9 @@ extern int
                              char *p);
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _LINEBREAK_H */