From e143639400c9d0cd5d383c1e790d4fb7beedf5d9 Mon Sep 17 00:00:00 2001 From: Rod Widdowson Date: Mon, 25 Mar 2019 13:01:51 +0000 Subject: [PATCH] Windows: Windows CRT doesn't support %k as format for strftime The fix involves: - Removing HAVE_STRFTIME from config.h.w32 - Adding strftime.c to the makefile - Defining timezone and tzname to their windows equivalent for the compile of this module --- include/config.h.w32 | 2 +- lib/roken/NTMakefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/config.h.w32 b/include/config.h.w32 index c33e6c93c..0d6e6a3ef 100644 --- a/include/config.h.w32 +++ b/include/config.h.w32 @@ -868,7 +868,7 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg } #define HAVE_STRERROR 1 /* Define if you have the function `strftime'. */ -#define HAVE_STRFTIME 1 +/* #define HAVE_STRFTIME 1 */ /* Define to 1 if you have the header file. */ /* #define HAVE_STRINGS_H 1 */ diff --git a/lib/roken/NTMakefile b/lib/roken/NTMakefile index 1445ed9dc..44ca1a0ba 100644 --- a/lib/roken/NTMakefile +++ b/lib/roken/NTMakefile @@ -99,6 +99,7 @@ libroken_la_OBJS = \ $(OBJ)\sockstartup_w32.obj \ $(OBJ)\strcollect.obj \ $(OBJ)\strerror_r.obj \ + $(OBJ)\strftime.obj \ $(OBJ)\strlcat.obj \ $(OBJ)\strlcpy.obj \ $(OBJ)\strndup.obj \