From bb18817c6890598a5adad5bbe3ae674be4435a9b Mon Sep 17 00:00:00 2001 From: Richard Meadows Date: Tue, 2 Aug 2016 11:35:09 +0100 Subject: [PATCH] update location of localtime_r and gmtime_r definitions. They're now in upstream fldigi. --- src/RFC3339.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/RFC3339.cxx b/src/RFC3339.cxx index 38b3f3d..bdc252b 100644 --- a/src/RFC3339.cxx +++ b/src/RFC3339.cxx @@ -11,13 +11,21 @@ #include #include +/* Daniel Richman 2012-08-24 02:21:14: */ /* on mingw32, localtime_r and gmtime_r don't exist. Instead, pthreadsw32's * pthread.h provides macros that map calls from localtime_r to localtime(), * (and the same for gmtime), noting that "[the] WIN32 C runtime library has * been made thread-safe without affecting the user interface." * * tl;dr: need to include pthread.h to get localtime_r on mingw32 */ -#include +// #include +/* Richard Meadows 2016-08-02 11:31:39: */ +/* since Daniel's comment, the situation has changed. These + * definitions are gone in pthreadsw32 2.9.1, and instead upstream + * fldigi have rolled their own. These are in timeops.h, so include + * that instead */ +#include "timeops.h" + using namespace std;