diff options
| -rw-r--r-- | src/wt-1-fixes.patch | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/wt-1-fixes.patch b/src/wt-1-fixes.patch index f28088e..23894db 100644 --- a/src/wt-1-fixes.patch +++ b/src/wt-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev <bnagaev@gmail.com> Date: Sat, 1 Apr 2017 15:17:43 +0200 -Subject: [PATCH 1/1] Wt fixes +Subject: [PATCH 1/2] Wt fixes diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt @@ -82,3 +82,23 @@ index 1111111..2222222 100644 ELSEIF(APPLE) FIND_LIBRARY(SSL_LIB NAMES + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Wed, 15 Aug 2018 13:28:31 +1000 +Subject: [PATCH 2/2] fix w32 build posix threads enabled + + +diff --git a/src/http/Reply.C b/src/http/Reply.C +index 1111111..2222222 100644 +--- a/src/http/Reply.C ++++ b/src/http/Reply.C +@@ -23,7 +23,7 @@ + #include <string> + #include <boost/lexical_cast.hpp> + +-#ifdef WT_WIN32 ++#if defined(WT_WIN32) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS) + // gmtime_r can be defined by mingw + #ifndef gmtime_r + static struct tm* gmtime_r(const time_t* t, struct tm* r) |