diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-04-19 22:44:57 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-04-19 22:44:57 +0200 |
commit | c12b0d0ef846518db2d9c44676792a4bfc4ffe99 (patch) | |
tree | 634444190b8e0e1decb9168756e5cd0671023932 | |
parent | 5d654880ee08b44979cb17ba6ad6b7bf140294e5 (diff) | |
download | sink-c12b0d0ef846518db2d9c44676792a4bfc4ffe99.tar.gz sink-c12b0d0ef846518db2d9c44676792a4bfc4ffe99.zip |
Windows compat
-rw-r--r-- | common/log.cpp | 5 | ||||
-rw-r--r-- | common/storage_lmdb.cpp | 5 | ||||
-rw-r--r-- | synchronizer/main.cpp | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/common/log.cpp b/common/log.cpp index e726cd5..55f6b1f 100644 --- a/common/log.cpp +++ b/common/log.cpp | |||
@@ -9,7 +9,12 @@ | |||
9 | #include <QMutex> | 9 | #include <QMutex> |
10 | #include <QMutexLocker> | 10 | #include <QMutexLocker> |
11 | #include <iostream> | 11 | #include <iostream> |
12 | #ifdef Q_OS_WIN | ||
13 | #include <io.h> | ||
14 | #include <process.h> | ||
15 | #else | ||
12 | #include <unistd.h> | 16 | #include <unistd.h> |
17 | #endif | ||
13 | #include <atomic> | 18 | #include <atomic> |
14 | #include <definitions.h> | 19 | #include <definitions.h> |
15 | #include <QThreadStorage> | 20 | #include <QThreadStorage> |
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp index 49f30b5..227d52e 100644 --- a/common/storage_lmdb.cpp +++ b/common/storage_lmdb.cpp | |||
@@ -32,6 +32,11 @@ | |||
32 | #include <lmdb.h> | 32 | #include <lmdb.h> |
33 | #include "log.h" | 33 | #include "log.h" |
34 | 34 | ||
35 | #ifdef Q_OS_WIN | ||
36 | #include <BaseTsd.h> | ||
37 | typedef SSIZE_T ssize_t; | ||
38 | #endif | ||
39 | |||
35 | namespace Sink { | 40 | namespace Sink { |
36 | namespace Storage { | 41 | namespace Storage { |
37 | 42 | ||
diff --git a/synchronizer/main.cpp b/synchronizer/main.cpp index d5520f2..e1e169b 100644 --- a/synchronizer/main.cpp +++ b/synchronizer/main.cpp | |||
@@ -22,7 +22,9 @@ | |||
22 | #include <QDir> | 22 | #include <QDir> |
23 | 23 | ||
24 | #include <signal.h> | 24 | #include <signal.h> |
25 | #ifndef Q_OS_WIN | ||
25 | #include <execinfo.h> | 26 | #include <execinfo.h> |
27 | #endif | ||
26 | #include <csignal> | 28 | #include <csignal> |
27 | #include <iostream> | 29 | #include <iostream> |
28 | #include <cstdlib> | 30 | #include <cstdlib> |
@@ -47,6 +49,7 @@ static Listener *listener = nullptr; | |||
47 | //Print a demangled stacktrace | 49 | //Print a demangled stacktrace |
48 | void printStacktrace() | 50 | void printStacktrace() |
49 | { | 51 | { |
52 | #ifndef Q_OS_WIN | ||
50 | int skip = 1; | 53 | int skip = 1; |
51 | void *callstack[128]; | 54 | void *callstack[128]; |
52 | const int nMaxFrames = sizeof(callstack) / sizeof(callstack[0]); | 55 | const int nMaxFrames = sizeof(callstack) / sizeof(callstack[0]); |
@@ -81,6 +84,7 @@ void printStacktrace() | |||
81 | trace_buf << "[truncated]\n"; | 84 | trace_buf << "[truncated]\n"; |
82 | } | 85 | } |
83 | std::cerr << trace_buf.str(); | 86 | std::cerr << trace_buf.str(); |
87 | #endif | ||
84 | } | 88 | } |
85 | 89 | ||
86 | static int sCounter = 0; | 90 | static int sCounter = 0; |