projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'b572c3a256e7bf1e4eecc8c36448c08093240a6a' into stable
[gnulib.git]
/
lib
/
mbswidth.h
diff --git
a/lib/mbswidth.h
b/lib/mbswidth.h
index
1935e0a
..
9e0e886
100644
(file)
--- a/
lib/mbswidth.h
+++ b/
lib/mbswidth.h
@@
-1,10
+1,10
@@
/* Determine the number of screen columns needed for a string.
/* 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
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
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
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <stddef.h>
#include <stddef.h>
@@
-30,7
+29,7
@@
#endif
#endif
-#ifdef __cplusplus
+#ifdef __cplusplus
extern "C" {
#endif
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. */
/* 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. */
/* 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);
extern int mbsnwidth (const char *buf, size_t nbytes, int flags);
-#ifdef __cplusplus
+#ifdef __cplusplus
}
#endif
}
#endif