reserve trailing speces

LiamBindle · Nov 9, 2021 · cb7b19d · cb7b19d
1 parent 573a8aa
commit cb7b19d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/examples/bio_publisher.c b/examples/bio_publisher.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <pthread.h>
 
 #include <mqtt.h>
 #include "templates/bio_sockets.h"

diff --git a/examples/openssl_publisher.c b/examples/openssl_publisher.c
@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <pthread.h>
 
 #include <mqtt.h>
 #include "templates/openssl_sockets.h"

diff --git a/examples/templates/posix_sockets.h b/examples/templates/posix_sockets.h
@@ -6,6 +6,8 @@
 #if !defined(WIN32)
 #include <sys/socket.h>
 #include <netdb.h>
+#else
+#include <ws2tcpip.h>
 #endif
 #if defined(__VMS)
 #include <ioctl.h>

diff --git a/include/mqtt_pal.h b/include/mqtt_pal.h
@@ -118,7 +118,7 @@ extern "C" {
             typedef int mqtt_pal_socket_handle;
         #endif
     #endif
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(WIN32)
     #include <limits.h>
     #include <winsock2.h>
     #include <windows.h>

diff --git a/makefile b/makefile
@@ -1,7 +1,12 @@
+UNAME = $(shell uname -o)
 
 CC = gcc
 CFLAGS = -Wextra -Wall -std=gnu99 -Iinclude -Wno-unused-parameter -Wno-unused-variable -Wno-duplicate-decl-specifier
 
+ifeq ($(UNAME), Msys)
+MSFLAGS = -lws2_32
+endif
+
 MQTT_C_SOURCES = src/mqtt.c src/mqtt_pal.c
 MQTT_C_EXAMPLES = bin/simple_publisher bin/simple_subscriber bin/reconnect_subscriber bin/bio_publisher bin/openssl_publisher
 MQTT_C_UNITTESTS = bin/tests
@@ -10,25 +15,25 @@ BINDIR = bin
 all: $(BINDIR) $(MQTT_C_UNITTESTS) $(MQTT_C_EXAMPLES)
 
 bin/simple_%: examples/simple_%.c $(MQTT_C_SOURCES)
-	$(CC) $(CFLAGS) $^ -lpthread -o $@
+	$(CC) $(CFLAGS) $^ -lpthread $(MSFLAGS) -o $@
 
 bin/reconnect_%: examples/reconnect_%.c $(MQTT_C_SOURCES)
-	$(CC) $(CFLAGS) $^ -lpthread -o $@
+	$(CC) $(CFLAGS) $^ -lpthread $(MSFLAGS) -o $@
 
 bin/bio_%: examples/bio_%.c $(MQTT_C_SOURCES)
-	$(CC) $(CFLAGS) `pkg-config --cflags openssl` -D MQTT_USE_BIO $^ -lpthread `pkg-config --libs openssl` -o $@
+	$(CC) $(CFLAGS) `pkg-config --cflags openssl` -D MQTT_USE_BIO $^ -lpthread $(MSFLAGS) `pkg-config --libs openssl` -o $@
 
 bin/openssl_%: examples/openssl_%.c $(MQTT_C_SOURCES)
-	$(CC) $(CFLAGS) `pkg-config --cflags openssl` -D MQTT_USE_BIO $^ -lpthread `pkg-config --libs openssl` -o $@
+	$(CC) $(CFLAGS) `pkg-config --cflags openssl` -D MQTT_USE_BIO $^ -lpthread $(MSFLAGS) `pkg-config --libs openssl` -o $@
 
 $(BINDIR):
 	mkdir -p $(BINDIR)
 
 $(MQTT_C_UNITTESTS): tests.c $(MQTT_C_SOURCES)
-	$(CC) $(CFLAGS) $^ -lcmocka -o $@
+	$(CC) $(CFLAGS) $^ -lcmocka $(MSFLAGS) -o $@
 
 clean:
 	rm -rf $(BINDIR)
 
 check: all
-	./$(MQTT_C_UNITTESTS)
+	./$(MQTT_C_UNITTESTS)
diff --git a/src/mqtt_pal.c b/src/mqtt_pal.c
@@ -353,7 +353,7 @@ ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t bufsz, int
     return buf - start;
 }
 
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(WIN32)
 
 #include <errno.h>