X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbswidth.h;h=9e0e886c804a8ea3277daebbae8f5a740d3809a6;hb=46380c372f75d7a8609c6646e48099a9b84f7ec2;hp=4fcdb2096ae17033a0045604880ef50881fd1f71;hpb=13b0be333a66cf138892d21fa0dccb35e7cb7d8a;p=gnulib.git
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 4fcdb2096..9e0e886c8 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-2011 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,7 +29,7 @@
#endif
-#ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
#endif
@@ -44,7 +43,7 @@ extern "C" {
/* 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. */
@@ -56,6 +55,6 @@ extern int mbswidth (const char *string, int flags);
extern int mbsnwidth (const char *buf, size_t nbytes, int flags);
-#ifdef __cplusplus
+#ifdef __cplusplus
}
#endif