X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbswidth.h;h=38911da00259d5ee8ed1859100fa3c76cc6623fd;hb=fe13248ec3e6de9b670cc1d5786b58f514ef0abd;hp=00666a767d543e6c1fa496abf33627e3ae0f1031;hpb=38de095e04375966f7062ea9d7ca02957130ce20;p=gnulib.git

diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 00666a767..38911da00 100644
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001 Free Software Foundation, Inc.
 
    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
@@ -16,7 +16,7 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef PARAMS
-# if defined PROTOTYPES || defined __STDC__
+# if defined (__GNUC__) || __STDC__
 #  define PARAMS(Args) Args
 # else
 #  define PARAMS(Args) ()
@@ -25,15 +25,17 @@
 
 /* Optional flags to influence mbswidth/mbsnwidth behavior.  */
 
-/* Assume invalid characters have width 0.  If this bit is not set,
-   return -1 upon finding an invalid or incomplete character.  */
-#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
 
-/* Assume unprintable characters have width 1.  If this bit is not set,
-   return -1 upon finding a non-printable character.  */
-#define MBSW_ACCEPT_UNPRINTABLE	2
+/* 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
 
 /* Returns the number of screen columns needed for STRING.  */
+#define mbswidth gnu_mbswidth  /* avoid clash with UnixWare 7.1.1 function */
 extern int mbswidth PARAMS ((const char *string, int flags));
 
 /* Returns the number of screen columns needed for the NBYTES bytes