From: Katharina Bogad <katharina@hacked.xyz> GLIBC defines wcschr, wcsrchr and wcspbrk in their version of wchar.h if C23 is in use. #undef them before ntdll macors are set. --- include/wine/unixlib.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index b0fd9b2604d..ddad6d66d89 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -255,6 +255,17 @@ NTSYSAPI int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD d NTSYSAPI int ntdll_wcsicmp( const WCHAR *str1, const WCHAR *str2 ); NTSYSAPI int ntdll_wcsnicmp( const WCHAR *str1, const WCHAR *str2, int n ); +/* glibc defines these functions as macros if C23 is in use */ +#if __GLIBC__ && defined(wcschr) && __STDC_VERSION__ == 202311L +#undef wcschr +#endif +#if __GLIBC__ && defined(wcsrchr) && __STDC_VERSION__ == 202311L +#undef wcsrchr +#endif +#if __GLIBC__ && defined(wcspbrk) && __STDC_VERSION__ == 202311L +#undef wcspbrk +#endif + #define iswspace(ch) ntdll_iswspace(ch) #define wcslen(str) ntdll_wcslen(str) #define wcscpy(dst,src) ntdll_wcscpy(dst,src) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10540