summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/mbswidth.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 40d4cba04..b3646ea2d 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-2002 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003 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
@@ -17,6 +17,14 @@
#include <stddef.h>
+/* Avoid a clash of our mbswidth() with a function of the same name defined
+ in UnixWare 7.1.1 <wchar.h>. We need this #include before the #define
+ below. */
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
+
/* Optional flags to influence mbswidth/mbsnwidth behavior. */
/* If this bit is set, return -1 upon finding an invalid or incomplete