Portability fix for SCO 3.2.5.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 016cff597effb38a080fff317c2c901445a24fc4..e945f249acb1b1eec7b71a3fb6b4e2e65c443c89 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-25  Bruno Haible  <haible@clisp.cons.org>
+
+       * mbswidth.c (mbsinit): Define to 1 if not defined. For SCO 3.2v5.0.2.
+
 2001-06-10  Bruno Haible  <haible@clisp.cons.org>
 
        * findprog.h: New file.

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

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 087b37bc43c4fb20a08c6f68550d6031a627752b..86a89d951d1def9f04ae2a2d306130cf442eac9d 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-25  Bruno Haible  <haible@clisp.cons.org>
+
+       * mbswidth.m4: Also check for mbsinit. Needed for SCO 3.2v5.0.2.
+
 2001-06-14  Bruno Haible  <haible@clisp.cons.org>
 
        * gettext.m4 (AM_WITH_NLS): Add support for autoconf-2.50.

diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index 7464a8707bf55f61581300e36636e4251e4f1a9c..26f661f6490bec01f0bcddf596e60f4acb784427 100644 (file)
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 
 dnl autoconf tests required for use of mbswidth.c
 dnl From Bruno Haible.
@@ -7,7 +7,7 @@ AC_DEFUN(jm_PREREQ_MBSWIDTH,
 [
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
-  AC_CHECK_FUNCS(isascii iswcntrl iswprint wcwidth)
+  AC_CHECK_FUNCS(isascii iswcntrl iswprint mbsinit wcwidth)
   jm_FUNC_MBRTOWC
 
   AC_CACHE_CHECK([whether wcwidth is declared], ac_cv_have_decl_wcwidth,