[PATCH v3 2/4] include: only define _tcs macros on suitable libc.
Jacek Caban
jacek at codeweavers.com
Wed Sep 30 16:07:31 CDT 2020
Hi Kevin,
On 24/09/2020 17:12, Kevin Puetz wrote:
> --- a/include/tchar.h
> +++ b/include/tchar.h
> @@ -37,9 +37,15 @@ extern "C" {
> #define _strninc(str,n) (((char*)(str))+(n))
> #define _strspnp(s1,s2) (*((s1)+=strspn((s1),(s2))) ? (s1) : NULL)
>
> +#if defined(__MSVCRT__) || defined(_MSC_VER) || (defined(WINE_UNICODE_NATIVE) && defined(_UNICODE)) || !(defined(_UNICODE) || defined(_MBCS))
>
This seems to be more complicated than it needs to be. Since guarded
macros really belong to crt, maybe we should have a guard bellow
includes of string.h, wchar.h, etc. (to give corecrt.h a chance to be
included) and simply use:
#ifdef __WINE_USE_MSVCRT
Thanks,
Jacek
More information about the wine-devel
mailing list