Update 'mbswidth' module from gnulib.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 6fe5f3e702a384f71a738135fc5f48b0e1f96ffb..1279c8e8d46a818f892aca9eefbd0140b1ef1509 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -92,6 +92,11 @@
 
        * progname.h: Don't include stdbool.h.
 
+2004-07-16  Bruno Haible  <bruno@clisp.org>
+
+       * mbswidth.h: Add extern "C" for C++.
+       Reported by Albert Chin-A-Young <china@thewrittenword.com>.
+
 2003-09-08  Paul Eggert  <eggert@twinsun.com>
 
        * atexit.c (atexit): Define using a prototype.

diff --git a/gettext-tools/lib/mbswidth.c b/gettext-tools/lib/mbswidth.c
index 6b9d4b38bbe6e8e135ae2a40f9ed523a6be4c719..a51176026da466c6b47a17a67ac924836c562cb8 100644 (file)
--- a/gettext-tools/lib/mbswidth.c
+++ b/gettext-tools/lib/mbswidth.c
@@ -91,7 +91,7 @@ int wcwidth ();
    character string pointed to by STRING.  If a non-printable character
    occurs, and MBSW_REJECT_UNPRINTABLE is specified, -1 is returned.
    With flags = MBSW_REJECT_INVALID | MBSW_REJECT_UNPRINTABLE, this is
-   the multibyte analogon of the wcswidth function.  */
+   the multibyte analogue of the wcswidth function.  */
 int
 mbswidth (const char *string, int flags)
 {

diff --git a/gettext-tools/lib/mbswidth.h b/gettext-tools/lib/mbswidth.h
index 6fec3f4904a4acbe80ccdc29f8e57b6510c5ba82..4fcdb2096ae17033a0045604880ef50881fd1f71 100644 (file)
--- a/gettext-tools/lib/mbswidth.h
+++ b/gettext-tools/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