From e2bf48f0f4b2650932f6cde447e7ea2b422c43a9 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sun, 28 Oct 2018 02:18:41 +0200 Subject: Fix build for mingw --- depends/sibs-pubsub | 2 +- include/odhtdb/env.hpp | 2 +- src/FileUtils.cpp | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/depends/sibs-pubsub b/depends/sibs-pubsub index 4fffc1c..c1322a2 160000 --- a/depends/sibs-pubsub +++ b/depends/sibs-pubsub @@ -1 +1 @@ -Subproject commit 4fffc1cd8ccf1c3b1f15b2cb1942daf8cdd556ab +Subproject commit c1322a271104d037684fb21e2cdced47c566a3c8 diff --git a/include/odhtdb/env.hpp b/include/odhtdb/env.hpp index abaedd8..57ae068 100644 --- a/include/odhtdb/env.hpp +++ b/include/odhtdb/env.hpp @@ -27,7 +27,7 @@ #define WIN32_LEAN_AND_MEAN #endif - #include + #include #endif #if defined(__linux__) || defined(__unix__) || defined(__APPLE__) || defined(_POSIX_VERSION) diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp index 28bce29..2258081 100644 --- a/src/FileUtils.cpp +++ b/src/FileUtils.cpp @@ -3,6 +3,11 @@ using namespace std; +#ifdef __MINGW32__ +#define flockfile(fp) +#define funlockfile(fp) +#endif + namespace odhtdb { OwnedByteArray fileGetContent(const boost::filesystem::path &filepath) -- cgit v1.2.3