Allow use in C++ environment.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 2c28e44b16f53665d629a872e51a16de89f6e050..a77eb811e8f6cf6584c8e8668bf8d5402b77ad70 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-16  Bruno Haible  <bruno@clisp.org>
+
+       * mbswidth.h: Add extern "C" for C++.
+       Reported by Albert Chin-A-Young <china@thewrittenword.com>.
+
 2004-07-09  Simon Josefsson  <jas@extundo.com>
 
        * getndelim2.c: Include stddef.h, for ptrdiff_t.  (FreeBSD 4.9

diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 6fec3f4904a4acbe80ccdc29f8e57b6510c5ba82..4fcdb2096ae17033a0045604880ef50881fd1f71 100644 (file)
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -30,6 +30,11 @@
 #endif
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* Optional flags to influence mbswidth/mbsnwidth behavior.  */
 
 /* If this bit is set, return -1 upon finding an invalid or incomplete
@@ -49,3 +54,8 @@ extern int mbswidth (const char *string, int flags);
 /* Returns the number of screen columns needed for the NBYTES bytes
    starting at BUF.  */
 extern int mbsnwidth (const char *buf, size_t nbytes, int flags);
+
+
+#ifdef __cplusplus
+}
+#endif