Jacek Caban : include: Make corecrt_wtime.h compatible with ucrt.
Alexandre Julliard
julliard at winehq.org
Wed Feb 26 16:14:06 CST 2020
Module: wine
Branch: master
Commit: 7b2517df2f403f5b7ebaa05d5bece20131299b24
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2517df2f403f5b7ebaa05d5bece20131299b24
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Feb 26 15:16:29 2020 +0100
include: Make corecrt_wtime.h compatible with ucrt.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/msvcrt/corecrt_wtime.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/msvcrt/corecrt_wtime.h b/include/msvcrt/corecrt_wtime.h
index 3422b2d349..3e0547b0ae 100644
--- a/include/msvcrt/corecrt_wtime.h
+++ b/include/msvcrt/corecrt_wtime.h
@@ -20,7 +20,7 @@ struct tm {
int tm_isdst;
};
-#ifdef _USE_32BIT_TIME_T
+#if defined(_USE_32BIT_TIME_T) && !defined(_UCRT)
#define _wctime32 _wctime
#endif
@@ -39,6 +39,8 @@ errno_t __cdecl _wstrtime_s(wchar_t*,size_t);
#ifndef _USE_32BIT_TIME_T
static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); }
+#elif defined(_UCRT)
+static inline wchar_t* _wctime(const time_t *t) { return _wctime32(t); }
#endif
#ifdef __cplusplus
More information about the wine-cvs
mailing list