[PATCH v2 0/2] MR20: include/msvcrt: redefine tolower & toupper with wint_t parameters

[eric pouech (＠epo)]

it conflicts in C++ compilation with MINGW builtin definitions

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

--
  v2: include/msvcrt: redefine towlower* & towupper* with wint_t types
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/20

[PATCH v2 1/2] include/msvcrt: redefine tolower & toupper with wint_t parameters

[Eric Pouech]

From: Eric Pouech <eric.pouech(a)gmail.com>

it conflicts in C++ compilation with MINGW builtin definitions

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
 include/msvcrt/corecrt_wctype.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h
index 33f91db9719..be2722bf8c8 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
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/20

[PATCH v2 2/2] include/msvcrt: redefine towlower* & towupper* with wint_t types

[Eric Pouech]

From: Eric Pouech <eric.pouech(a)gmail.com>

it conflicts in C++ compilation with MINGW builtin definitions

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
 include/msvcrt/wctype.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

https://gitlab.winehq.org/wine/wine/-/merge_requests/20