From: Eric Pouech eric.pouech@gmail.com
It conflicts in C++ compilation with MINGW builtin definitions.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org --- include/msvcrt/corecrt_wctype.h | 8 ++++---- include/msvcrt/wctype.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index 33f91db9719..9661ab5e596 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -36,8 +36,8 @@ _ACRTIMP int __cdecl _iswprint_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswpunct_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswspace_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswupper_l(wint_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towlower_l(wchar_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towupper_l(wchar_t,_locale_t); +_ACRTIMP wint_t __cdecl _towlower_l(wint_t,_locale_t); +_ACRTIMP wint_t __cdecl _towupper_l(wint_t,_locale_t); _ACRTIMP int __cdecl is_wctype(wint_t,wctype_t); _ACRTIMP int __cdecl isleadbyte(int); _ACRTIMP int __cdecl iswalnum(wint_t); @@ -54,8 +54,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t);
#ifdef __cplusplus } diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index 2cf4636a88b..27a6adcd922 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -64,8 +64,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #endif /* _WCTYPE_DEFINED */
typedef wchar_t wctrans_t;