Portability fix for SCO 3.2.5.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index bd596e7d6dd5430b5c94f41cde2dd87239a9a6ee..2a06d473082e48b23ef8189c34525795f007ad8b 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,8 +1,3 @@
-2001-06-24  Bruno Haible  <haible@clisp.cons.org>
-
-       * config.charset: Change canonical name of BIG5HKSCS to BIG5-HKSCS.
-       Change canonical name of SJIS to SHIFT_JIS.
-
 2001-06-25  Bruno Haible  <haible@clisp.cons.org>
 
        * mbswidth.c (mbsinit): Define to 1 if not defined. For SCO 3.2v5.0.2.

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index 7c1c8c22601c3c9995240fd5555bf2b0e8edfa74..69a801ceaed6350681e0fd117b821e06525993da 100644 (file)
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -34,7 +34,7 @@
 # include <wchar.h>
 #endif
 
-/* Get iswprint().  */
+/* Get iswprint(), iswcntrl().  */
 #if HAVE_WCTYPE_H
 # include <wctype.h>
 #endif
@@ -45,6 +45,12 @@
 # define iswcntrl(wc) 0
 #endif
 
+#ifndef mbsinit
+# if !HAVE_MBSINIT
+#  define mbsinit(ps) 1
+# endif
+#endif
+
 #ifndef HAVE_DECL_WCWIDTH
 "this configure-time declaration test was not run"
 #endif