mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-22 21:47:54 +08:00
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
|
--- a/config.h
|
||
|
|
+++ b/config.h
|
||
|
|
@@ -16,7 +16,7 @@
|
||
|
|
# define EPROTO ECONNABORTED
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#ifdef WIN32
|
||
|
|
+#ifdef WIN32 || WIN64
|
||
|
|
# ifndef strcasecmp
|
||
|
|
# define strcasecmp strcmpi
|
||
|
|
# endif
|
||
|
|
--- a/lib/CMakeLists.txt
|
||
|
|
+++ b/lib/CMakeLists.txt
|
||
|
|
@@ -4,8 +4,8 @@
|
||
|
|
if (${WITH_THREADING} STREQUAL ON)
|
||
|
|
add_definitions("-DWITH_THREADING")
|
||
|
|
if (WIN32)
|
||
|
|
- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
|
||
|
|
- set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
|
||
|
|
+ set (PTHREAD_LIBRARIES ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/lib/pthreadsVC2.lib)
|
||
|
|
+ set (PTHREAD_INCLUDE_DIR ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/include)
|
||
|
|
else (WIN32)
|
||
|
|
find_library(LIBPTHREAD pthread)
|
||
|
|
if (LIBPTHREAD)
|
||
|
|
--- 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>
|
||
|
|
|