X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fmbswidth.h;h=15da406dce1d92bb4b6a8f2f4d31179e880c1b6c;hb=217969cf220de4c0515eccd614de1640c3f46bcf;hp=f76021b93baf5ffa834a4b52b90019b7ace680fa;hpb=91f65b21df1dc4efd7e28b849c00fe44cd9463e2;p=gnulib.git
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index f76021b93..15da406dc 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 Free Software Foundation, Inc.
+ Copyright (C) 2000-2004, 2007 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,30 +12,49 @@
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. */
-
-#ifndef PARAMS
-# if defined PROTOTYPES || defined __STDC__
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
+ 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.
+ 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. */
-/* Assume invalid characters have width 0. If this is not set, the
- functions return -1 if an invalid or incomplete character occurs. */
-#define MBSW_ACCEPT_INVALID 1
+/* If this bit is set, return -1 upon finding an invalid or incomplete
+ character. Otherwise, assume invalid characters have width 1. */
+#define MBSW_REJECT_INVALID 1
+
+/* 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
-/* Assume unprintable characters have width 1. If this is not set, the
- functions return -1 if a non-printable character occurs. */
-#define MBSW_ACCEPT_UNPRINTABLE 2
/* Returns the number of screen columns needed for STRING. */
-extern int mbswidth PARAMS ((const char *string, int flags));
+#define mbswidth gnu_mbswidth /* avoid clash with UnixWare 7.1.1 function */
+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 PARAMS ((const char *buf, size_t nbytes, int flags));
+extern int mbsnwidth (const char *buf, size_t nbytes, int flags);
+
+
+#ifdef __cplusplus
+}
+#endif