(mbrtowc, mbsinit):

Remove workaround macros for hosts that have mbrtowc but not
mbstate_t, as we now insist on proper declarations for both
before using mbrtowc.

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index bb6aa1a6d8e83587591ca558483f212d371be947..208a629d34f1fe93c0ee55c0211466f3ea5eebad 100644 (file)
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -51,12 +51,6 @@
 # define iswprint(wc) 1
 #endif
 
-/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
-#if HAVE_MBRTOWC && defined mbstate_t
-# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
-# define mbsinit(ps) 1
-#endif
-
 #ifndef HAVE_DECL_WCWIDTH
 "this configure-time declaration test was not run"
 #endif

diff --git a/lib/quotearg.c b/lib/quotearg.c
index a668a68b574464e6922f995af38afd7289890e58..2a7ba4c445ba42b8aaf913e810c41ce8e5be8c18 100644 (file)
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -66,13 +66,7 @@
 # include <wchar.h>
 #endif
 
-#if HAVE_MBRTOWC
-size_t mbrtowc ();
-# ifdef mbstate_t
-#  define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
-#  define mbsinit(ps) 1
-# endif
-#else
+#if !HAVE_MBRTOWC
 /* Disable multibyte processing entirely.  Since MB_CUR_MAX is 1, the
    other macros are defined only for documentation and to satisfy C
    syntax.  */