yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Windows: tests with building librecoll with mingw

Browse source
This commit is contained in:
Jean-Francois Dockes 2015-10-03 10:21:24 +02:00
parent ce62afaede
commit 5f4dc25e49
3 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/autoconfig-win.h
View file

@ -21,7 +21,7 @@ overriden in the c++ code by ifdefs _WIN32 anyway */
#define FILE_PROG "/usr/bin/file" #define FILE_PROG "/usr/bin/file"
/* "Have C++0x" */ /* "Have C++0x" */
#undef HAVE_CXX0X_UNORDERED #define HAVE_CXX0X_UNORDERED 1
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1

32
src/common/conf_post.h
View file

@ -28,6 +28,25 @@
#ifdef _WIN32 #ifdef _WIN32
#include "safewindows.h" #include "safewindows.h"
#undef RCL_ICONV_INBUF_CONST
#ifdef _MSC_VER
// gmtime is supposedly thread-safe on windows
#define gmtime_r(A, B) gmtime(A)
#define localtime_r(A,B) localtime(A)
typedef int mode_t;
#define fseeko _fseeki64
#define ftello (off_t)_ftelli64
#define ftruncate _chsize_s
#define PATH_MAX MAX_PATH
#define RCL_ICONV_INBUF_CONST 1
#else
// Gminw
#undef RCL_ICONV_INBUF_CONST
#endif
typedef int pid_t; typedef int pid_t;
inline int readlink(const char *cp, void *buf, int cnt) { inline int readlink(const char *cp, void *buf, int cnt) {
return -1; return -1;
@ -35,18 +54,9 @@ inline int readlink(const char *cp, void *buf, int cnt) {
#define HAVE_STRUCT_TIMESPEC #define HAVE_STRUCT_TIMESPEC
#define strdup _strdup #define strdup _strdup
#define timegm _mkgmtime #define timegm _mkgmtime
#ifdef _MSC_VER
// gmtime is supposedly thread-safe on windows
#define gmtime_r(A, B) gmtime(A)
#define localtime_r(A,B) localtime(A)
#define PATH_MAX MAX_PATH
#define MAXPATHLEN PATH_MAX
typedef int mode_t;
#define fseeko _fseeki64
#define ftello (off_t)_ftelli64
#define ftruncate _chsize_s
#endif
#define MAXPATHLEN PATH_MAX
typedef DWORD32 u_int32_t; typedef DWORD32 u_int32_t;
typedef DWORD64 u_int64_t; typedef DWORD64 u_int64_t;
typedef unsigned __int8 u_int8_t; typedef unsigned __int8 u_int8_t;

7
src/windows/execmd_w.cpp
View file

@ -5,6 +5,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include UNORDERED_MAP_INCLUDE
#include "debuglog.h" #include "debuglog.h"
#include "safesysstat.h" #include "safesysstat.h"
@ -430,11 +431,11 @@ void ExecCmd::zapChild()
bool ExecCmd::requestChildExit() bool ExecCmd::requestChildExit()
{ {
if (m_piProcInfo.hProcess) { if (m->m_piProcInfo.hProcess) {
LOGDEB(("ExecCmd: GenerateConsoleCtrlEvent -> %d\n", LOGDEB(("ExecCmd: GenerateConsoleCtrlEvent -> %d\n",
m_piProcInfo.dwProcessId)); m->m_piProcInfo.dwProcessId));
return GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, return GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT,
m_piProcInfo.dwProcessId); m->m_piProcInfo.dwProcessId);
} }
return false; return false;
} }