blob: a7ac936e09d37887472c22063fe7a23b2b9451dd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff --git a/config.h b/config.h
index 906fad4..d5b2a72 100644
--- a/config.h
+++ b/config.h
@@ -15,7 +15,7 @@
# define EPROTO ECONNABORTED
#endif
-#ifdef WIN32
+#ifdef WIN32 || WIN64
# ifndef strcasecmp
# define strcasecmp strcmpi
# endif
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index d537e77..272b60a 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -6,12 +6,8 @@ option(WITH_THREADING "Include client library threading support?" ON)
if (${WITH_THREADING} STREQUAL ON)
add_definitions("-DWITH_THREADING")
if (WIN32)
- if (CMAKE_CL_64)
- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
- else (CMAKE_CL_64)
- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
- endif (CMAKE_CL_64)
- set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
+ find_library(PTHREAD_LIBRARIES NAMES pthreadsVC2)
+ find_path(PTHREAD_INCLUDE_DIR pthread.h)
else (WIN32)
find_library(LIBPTHREAD pthread)
if (LIBPTHREAD)
diff --git a/lib/net_mosq.h b/lib/net_mosq.h
index b5d8549..be60659 100644
--- a/lib/net_mosq.h
+++ b/lib/net_mosq.h
@@ -20,7 +20,12 @@
#include <unistd.h>
#else
#include <winsock2.h>
+#if defined(_MSC_VER) && _MSC_VER > 1900
+#undef ssize_t
typedef int ssize_t;
+#else
+typedef int ssize_t;
+#endif
#endif
#include "mosquitto_internal.h"
|
