From abaf4ca79787336afe38b340982593ceae56384c Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Wed, 13 Mar 2019 09:26:31 +0100 Subject: [PATCH] Move stopindexing from exe to lib to avoid symbol errors (win) --- src/common/autoconfig-win.h | 4 ++-- src/index/indexer.cpp | 4 ++++ src/index/recollindex.cpp | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/autoconfig-win.h b/src/common/autoconfig-win.h index 45cca94c..bf338a84 100644 --- a/src/common/autoconfig-win.h +++ b/src/common/autoconfig-win.h @@ -112,10 +112,10 @@ overriden in the c++ code by ifdefs _WIN32 anyway */ #define PACKAGE_NAME "Recoll" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Recoll 1.25.3" +#define PACKAGE_STRING "Recoll 1.25.6" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.25.3" +#define PACKAGE_VERSION "1.25.6" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "recoll" diff --git a/src/index/indexer.cpp b/src/index/indexer.cpp index 76c64d09..edb25ae0 100644 --- a/src/index/indexer.cpp +++ b/src/index/indexer.cpp @@ -41,6 +41,10 @@ using std::list; using std::string; using std::vector; +// Global stop request flag. This is checked in a number of place in the +// indexing routines. +int stopindexing; + // This would more logically live in recollindex.cpp, but then librecoll would // have an undefined symbol ConfSimple idxreasons; diff --git a/src/index/recollindex.cpp b/src/index/recollindex.cpp index b0b844bb..5ad7d9c7 100644 --- a/src/index/recollindex.cpp +++ b/src/index/recollindex.cpp @@ -100,10 +100,6 @@ static void cleanup() recoll_exitready(); } -// Global stop request flag. This is checked in a number of place in the -// indexing routines. -int stopindexing; - // Receive status updates from the ongoing indexing operation // Also check for an interrupt request and return the info to caller which // should subsequently orderly terminate what it is doing.