X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbswidth.h;h=ab7c1503733fac6639ec5f5f32609ea19cc65c51;hb=46f5f314f34a08c9305758482d7d2fdb0e999d09;hp=cd41c9f20efbeb6545db9cdcd025890218b1cc1c;hpb=4d217158cf62fd3dfeb782969438b62c572a7f37;p=gnulib.git
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index cd41c9f20..ab7c15037 100644
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -1,10 +1,10 @@
/* Determine the number of screen columns needed for a string.
- Copyright (C) 2000-2003 Free Software Foundation, Inc.
+ Copyright (C) 2000-2004, 2007, 2009-2014 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,19 +12,28 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
#include
/* Avoid a clash of our mbswidth() with a function of the same name defined
in UnixWare 7.1.1 . We need this #include before the #define
- below. */
-#if HAVE_WCHAR_H
+ below.
+ However, we don't want to #include on all platforms because
+ - Tru64 with Desktop Toolkit C has a bug: must be included before
+ .
+ - BSD/OS 4.1 has a bug: and must be included before
+ . */
+#if HAVE_DECL_MBSWIDTH_IN_WCHAR_H
# include
#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
@@ -34,7 +43,7 @@
/* If this bit is set, return -1 upon finding a non-printable character.
Otherwise, assume unprintable characters have width 0 if they are
control characters and 1 otherwise. */
-#define MBSW_REJECT_UNPRINTABLE 2
+#define MBSW_REJECT_UNPRINTABLE 2
/* Returns the number of screen columns needed for STRING. */
@@ -44,3 +53,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