Windows build fixes.

eclipse · Mar 5, 2019 · cd07c2b · cd07c2b
1 parent 105ad17
commit cd07c2b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -33,6 +33,7 @@ set(C_SRC
  options.c
  packet_datatypes.c
  packet_mosq.c packet_mosq.h
+ property_mosq.c property_mosq.h
  read_handle.c read_handle.h
  send_connect.c
  send_disconnect.c

diff --git a/lib/mosquitto.h b/lib/mosquitto.h
@@ -952,7 +952,7 @@ libmosq_EXPORT int mosquitto_subscribe_v5(struct mosquitto *mosq, int *mid, cons
  * MOSQ_ERR_OVERSIZE_PACKET - if the resulting packet would be larger than
  * supported by the broker.
  */
-int mosquitto_subscribe_multiple(struct mosquitto *mosq, int *mid, int sub_count, char *const *const sub, int qos, int options, const mosquitto_property *properties);
+libmosq_EXPORT int mosquitto_subscribe_multiple(struct mosquitto *mosq, int *mid, int sub_count, char *const *const sub, int qos, int options, const mosquitto_property *properties);
 
 /*
  * Function: mosquitto_unsubscribe
@@ -1035,7 +1035,7 @@ libmosq_EXPORT int mosquitto_unsubscribe_v5(struct mosquitto *mosq, int *mid, co
  * MOSQ_ERR_OVERSIZE_PACKET - if the resulting packet would be larger than
  * supported by the broker.
  */
-int mosquitto_unsubscribe_multiple(struct mosquitto *mosq, int *mid, int sub_count, char *const *const sub, const mosquitto_property *properties);
+libmosq_EXPORT int mosquitto_unsubscribe_multiple(struct mosquitto *mosq, int *mid, int sub_count, char *const *const sub, const mosquitto_property *properties);
 
 
 /* ======================================================================

diff --git a/lib/options.c b/lib/options.c
@@ -23,6 +23,9 @@ and the Eclipse Distribution License is available at
 #include <string.h>
 
 #ifdef WITH_TLS
+# ifdef WIN32
+# include <winsock2.h>
+# endif
 # include <openssl/engine.h>
 #endif
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,6 +3,7 @@ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src
  ${STDBOOL_H_PATH} ${STDINT_H_PATH})
 
 set (MOSQ_SRCS
+ ../lib/alias_mosq.c ../lib/alias_mosq.h
  conf.c
  conf_includedir.c
  context.c
@@ -53,6 +54,7 @@ set (MOSQ_SRCS
  ../lib/util_mosq.c ../lib/util_topic.c ../lib/util_mosq.h
  ../lib/utf8_mosq.c
  websockets.c
+ will_delay.c
  ../lib/will_mosq.c ../lib/will_mosq.h)
 
 

diff --git a/src/websockets.c b/src/websockets.c
@@ -41,9 +41,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdlib.h>
 #include <errno.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 
+#ifndef WIN32
+# include <sys/socket.h>
+#endif
+
 extern struct mosquitto_db int_db;
 
 #if defined(LWS_LIBRARY_VERSION_NUMBER)