Signed-off-by: Gijs Vermeulen gijsvrm@codeweavers.com --- dlls/msvcrt/time.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 0d5b64a4aa..592b049107 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1170,6 +1170,7 @@ static inline BOOL strftime_format(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR return ret; }
+#if _MSVCR_VER>=140 static inline BOOL strftime_tzdiff(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCRT_size_t max, BOOL is_dst) { MSVCRT_long tz = MSVCRT___timezone + (is_dst ? MSVCRT__dstbias : 0); @@ -1188,6 +1189,7 @@ static inline BOOL strftime_tzdiff(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR return FALSE; return strftime_int(str, pos, max, tz/60%60, 2, 0, 59); } +#endif
static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, const STRFTIME_CHAR *format, const struct MSVCRT_tm *mstm,
Looks right to me. So FWIW,
Signed-off-by: Jeff Smith whydoubt@gmail.com
On Tue, Nov 26, 2019 at 10:50 AM Gijs Vermeulen gijsvrm@codeweavers.com wrote:
Signed-off-by: Gijs Vermeulen gijsvrm@codeweavers.com
dlls/msvcrt/time.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 0d5b64a4aa..592b049107 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1170,6 +1170,7 @@ static inline BOOL strftime_format(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR return ret; }
+#if _MSVCR_VER>=140 static inline BOOL strftime_tzdiff(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCRT_size_t max, BOOL is_dst) { MSVCRT_long tz = MSVCRT___timezone + (is_dst ? MSVCRT__dstbias : 0); @@ -1188,6 +1189,7 @@ static inline BOOL strftime_tzdiff(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR return FALSE; return strftime_int(str, pos, max, tz/60%60, 2, 0, 59); } +#endif
static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, const STRFTIME_CHAR *format, const struct MSVCRT_tm *mstm, -- 2.24.0
-
Gijs Vermeulen -
Jeff Smith -
Piotr Caban