From 406189e88890a240c50cfd9f33613c4d4fb6d2bf Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Tue, 1 Nov 2011 22:56:51 +0200 Subject: Move non-MBS support glop out of dfa.c. --- mbsupport.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'mbsupport.h') diff --git a/mbsupport.h b/mbsupport.h index 6008da77..1a30785d 100644 --- a/mbsupport.h +++ b/mbsupport.h @@ -67,4 +67,21 @@ #if ! MBS_SUPPORT # undef MB_CUR_MAX # define MB_CUR_MAX 1 + +/* All this glop is for dfa.c. Bleah. */ + +#define wctype_t int +#define wint_t int +#define mbstate_t int +#define WEOF EOF +#define towupper toupper +#define towlower tolower +#define btowc(x) (x) +#define iswalnum isalnum +#define iswalpha isalpha +#define iswupper isupper + +extern wctype_t wctype(const char *name); +extern int iswctype(wint_t wc, wctype_t desc); +extern int wcscoll(const wchar_t *ws1, const wchar_t *ws2); #endif -- cgit v1.2.3 From cceacad1d367b3019a5648521d4b4c0e201297f5 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Mon, 14 Nov 2011 21:43:44 +0200 Subject: More changes for non-MBS case. --- mbsupport.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mbsupport.h') diff --git a/mbsupport.h b/mbsupport.h index 1a30785d..57abaa60 100644 --- a/mbsupport.h +++ b/mbsupport.h @@ -40,6 +40,7 @@ #if defined(HAVE_ISWCTYPE) \ && defined(HAVE_LOCALE_H) \ + && defined(HAVE_BTOWC) \ && defined(HAVE_MBRLEN) \ && defined(HAVE_MBRTOWC) \ && defined(HAVE_WCHAR_H) \ @@ -70,10 +71,11 @@ /* All this glop is for dfa.c. Bleah. */ +#define wchar_t char #define wctype_t int -#define wint_t int +#define wint_t int #define mbstate_t int -#define WEOF EOF +#define WEOF EOF #define towupper toupper #define towlower tolower #define btowc(x) (x) -- cgit v1.2.3 From c399d8f8226bba46d34b8672ca50722605f95e37 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Tue, 6 Dec 2011 21:39:57 +0200 Subject: MBS support tweaks for DJGPP and z/OS. --- mbsupport.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mbsupport.h') diff --git a/mbsupport.h b/mbsupport.h index 57abaa60..f647d788 100644 --- a/mbsupport.h +++ b/mbsupport.h @@ -40,7 +40,7 @@ #if defined(HAVE_ISWCTYPE) \ && defined(HAVE_LOCALE_H) \ - && defined(HAVE_BTOWC) \ + && (defined(HAVE_BTOWC) || defined(ZOS_USS)) \ && defined(HAVE_MBRLEN) \ && defined(HAVE_MBRTOWC) \ && defined(HAVE_WCHAR_H) \ @@ -71,7 +71,10 @@ /* All this glop is for dfa.c. Bleah. */ -#define wchar_t char +#ifndef DJGPP +#define wchar_t char +#endif + #define wctype_t int #define wint_t int #define mbstate_t int -- cgit v1.2.3