include/msvcrt: Redefine towlower* & towupper* with wint_t types.

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: Redefine towlower* & towupper* with wint_t types.
69ab9568 · Eric Pouech · Alexandre Julliard · c515e55d · 69ab9568 · 69ab9568
Commit 69ab9568 authored May 02, 2022 by Eric Pouech Committed by Alexandre Julliard May 03, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

corecrt_wctype.h include/msvcrt/corecrt_wctype.h +4 -4

wctype.h include/msvcrt/wctype.h +2 -2

No files found.
--- 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
 }

--- 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;