From 0edb5c290fdb90f8968191005a77e55853bd8c97 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 24 Jul 2001 12:56:00 +0000
Subject: [PATCH] Portability fix for SCO 3.2.5.

---
 lib/ChangeLog  | 5 -----
 lib/mbswidth.c | 8 +++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index bd596e7d6..2a06d4730 100644
--- 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 7c1c8c226..69a801cea 100644
--- 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
-- 
2.47.2