From 9f4e2e2646e87222e48ac06cd8e516aa111dff1f Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Wed, 13 Jul 2016 09:27:38 +0200
Subject: [PATCH] Small windows adjustements for std::mutex changes

---
 src/utils/rclutil.cpp                 | 2 +-
 src/utils/smallut.cpp                 | 2 +-
 src/windows/qmkrecoll/librecoll.pro   | 5 +++--
 src/windows/qmkrecoll/recollindex.pro | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/utils/rclutil.cpp b/src/utils/rclutil.cpp
index f8043eaa..13cc1e54 100644
--- a/src/utils/rclutil.cpp
+++ b/src/utils/rclutil.cpp
@@ -263,7 +263,7 @@ bool maketmpdir(string& tdir, string& reason)
     // mkdir. try to make sure that we at least don't shoot ourselves
     // in the foot
     static std::mutex mmutex;
-    std::unique_lock lock(mmutex);
+    std::unique_lock<std::mutex> lock(mmutex);
     tdir = path_wingettempfilename(TEXT("rcltmp"));
 #endif
 
diff --git a/src/utils/smallut.cpp b/src/utils/smallut.cpp
index 2d0e595c..590e0233 100644
--- a/src/utils/smallut.cpp
+++ b/src/utils/smallut.cpp
@@ -1240,9 +1240,9 @@ public:
                    ((flags&SRE_NOSUB) ? regex_constants::nosubs : 0)
                    )), ok(true), nmatch(nm) {
     }
-    bool ok;
     std::regex expr;
     std::smatch res;
+    bool ok;
     int nmatch;
 };
 
diff --git a/src/windows/qmkrecoll/librecoll.pro b/src/windows/qmkrecoll/librecoll.pro
index 2367a334..e5f3f003 100644
--- a/src/windows/qmkrecoll/librecoll.pro
+++ b/src/windows/qmkrecoll/librecoll.pro
@@ -33,6 +33,7 @@ SOURCES += \
 ../../index/bglfetcher.cpp \
 ../../index/checkretryfailed.cpp \
 ../../index/fetcher.cpp \
+../../index/exefetcher.cpp \
 ../../index/fsfetcher.cpp \
 ../../index/fsindexer.cpp \
 ../../index/indexer.cpp \
@@ -85,7 +86,6 @@ SOURCES += \
 ../../utils/conftree.cpp \
 ../../utils/copyfile.cpp \
 ../../utils/cpuconf.cpp \
-../../utils/debuglog.cpp \
 ../../utils/ecrontab.cpp \
 ../../windows/execmd_w.cpp \
 ../../windows/fnmatch.c \
@@ -93,6 +93,7 @@ SOURCES += \
 ../../utils/fstreewalk.cpp \
 ../../utils/hldata.cpp \
 ../../utils/idfile.cpp \
+../../utils/log.cpp \
 ../../utils/md5.cpp \
 ../../utils/md5ut.cpp \
 ../../utils/mimeparse.cpp \
@@ -115,7 +116,7 @@ INCLUDEPATH += ../../common ../../index ../../internfile ../../query \
 windows {
     contains(QMAKE_CC, gcc){
         # MingW
-        QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter
+        QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
     }
     contains(QMAKE_CC, cl){
         # Visual Studio
diff --git a/src/windows/qmkrecoll/recollindex.pro b/src/windows/qmkrecoll/recollindex.pro
index e4b2f4b7..3f9e2994 100644
--- a/src/windows/qmkrecoll/recollindex.pro
+++ b/src/windows/qmkrecoll/recollindex.pro
@@ -25,7 +25,7 @@ INCLUDEPATH += ../../common ../../index ../../internfile ../../query \
 windows {
     contains(QMAKE_CC, gcc){
         # MingW
-        QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter
+        QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
     }
     contains(QMAKE_CC, cl){
         # Visual Studio