From 6c77bb9f3034767a904517e4e460e680349c28c7 Mon Sep 17 00:00:00 2001 From: Owen Shepherd Date: Tue, 1 Jan 2013 21:38:14 +0000 Subject: [PATCH] PDCLIB-2 PDCLIB-9: Internal mbstates --- functions/wchar/mbrtowc.c | 3 ++- functions/wchar/wcrtomb.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/functions/wchar/mbrtowc.c b/functions/wchar/mbrtowc.c index 610f828..91fefeb 100644 --- a/functions/wchar/mbrtowc.c +++ b/functions/wchar/mbrtowc.c @@ -79,7 +79,8 @@ size_t mbrtowc( mbstate_t *restrict ps ) { - return mbrtowc_l(pwc, s, n, ps, _PDCLIB_threadlocale()); + static mbstate_t st; + return mbrtowc_l(pwc, s, n, ps ? ps : &st, _PDCLIB_threadlocale()); } #endif diff --git a/functions/wchar/wcrtomb.c b/functions/wchar/wcrtomb.c index e692923..0372471 100644 --- a/functions/wchar/wcrtomb.c +++ b/functions/wchar/wcrtomb.c @@ -32,7 +32,8 @@ size_t wcrtomb( mbstate_t *restrict ps ) { - return _PDCLIB_cwcrtomb(s, wc, ps); + static mbstate_t st; + return _PDCLIB_cwcrtomb(s, wc, ps ? ps : &st); } #endif -- 2.40.0