From db5283c74954c09ce38522191517e8fef4c57a3c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 17 Feb 2001 10:39:17 +0000 Subject: [PATCH] (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. --- lib/mbswidth.c | 6 ------ lib/quotearg.c | 8 +------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/mbswidth.c b/lib/mbswidth.c index bb6aa1a6d8..208a629d34 100644 --- 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 a668a68b57..2a7ba4c445 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -66,13 +66,7 @@ # include #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. */ -- 2.30.2