mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-17 03:58:01 +08:00
51 lines
1.3 KiB
Diff
51 lines
1.3 KiB
Diff
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"
|
|
|