X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbswidth.h;h=ab7c1503733fac6639ec5f5f32609ea19cc65c51;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=6fec3f4904a4acbe80ccdc29f8e57b6510c5ba82;hpb=d65bac0ebeea2672d71c44a35c8e15a07fc6a2c7;p=gnulib.git
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 6fec3f490..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-2004 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,8 +12,7 @@
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
@@ -30,6 +29,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
@@ -39,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. */
@@ -49,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