summaryrefslogtreecommitdiffstats
path: root/src/wt-1-fixes.patch
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2018-09-17 21:32:54 (GMT)
committerMark Brand <mabrand@mabrand.nl>2018-09-20 19:01:19 (GMT)
commit89ff5313c12647d2f1561f64d3701503d346b043 (patch)
tree3eb3650a77c2a64a469232c41d5b0e52bfddd295 /src/wt-1-fixes.patch
parent16ecf4503fd0ba9c60d3dd456e1a66fb646147db (diff)
downloadmxe-89ff5313c12647d2f1561f64d3701503d346b043.zip
mxe-89ff5313c12647d2f1561f64d3701503d346b043.tar.gz
mxe-89ff5313c12647d2f1561f64d3701503d346b043.tar.bz2
wt: mingw-w64 6 compatibility
Diffstat (limited to 'src/wt-1-fixes.patch')
-rw-r--r--src/wt-1-fixes.patch23
1 files changed, 21 insertions, 2 deletions
diff --git a/src/wt-1-fixes.patch b/src/wt-1-fixes.patch
index 23894db..8f358d6 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/2] Wt fixes
+Subject: [PATCH 1/3] Wt fixes
diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
@@ -86,7 +86,7 @@ index 1111111..2222222 100644
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
+Subject: [PATCH 2/3] fix w32 build posix threads enabled
diff --git a/src/http/Reply.C b/src/http/Reply.C
@@ -102,3 +102,22 @@ index 1111111..2222222 100644
// gmtime_r can be defined by mingw
#ifndef gmtime_r
static struct tm* gmtime_r(const time_t* t, struct tm* r)
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Mon, 17 Sep 2018 23:31:42 +0200
+Subject: [PATCH 3/3] fix missing gmtime_r definition
+
+
+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
+@@ -13,6 +13,7 @@
+ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ //
+
++#include <unistd.h>
+ #include "Configuration.h"
+ #include "Connection.h"
+ #include "Reply.h"