X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbswidth.h;h=2a7cdcb83e159925c3ef628392e25bbd4a0c57cc;hb=7e3abbd47249138beefb283c6f63126c0eb46412;hp=f76021b93baf5ffa834a4b52b90019b7ace680fa;hpb=91f65b21df1dc4efd7e28b849c00fe44cd9463e2;p=gnulib.git

diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index f76021b93..2a7cdcb83 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
@@ -25,15 +25,16 @@
 
 /* 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, assume invalid characters have width 0.
+   Otherwise, return -1 upon finding an invalid or incomplete character.  */
+#define MBSW_ACCEPT_INVALID 1
 
-/* Assume unprintable characters have width 1.  If this is not set, the
-   functions return -1 if a non-printable character occurs.  */
+/* If this bit is set, assume unprintable characters have width 1.
+   Otherwise, return -1 upon finding a non-printable character.  */
 #define MBSW_ACCEPT_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