fix: compiles on windows

SquireTournamentServices · Jul 27, 2023 · a1b9632 · a1b9632
1 parent 4eebd32
commit a1b9632
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,6 +109,7 @@ endif()
 
 if(WIN32)
   set(ADDITIONAL_FLEX_FLAGS "--wincompat")
+  set(LIBS ${LIBS} win32)
 else()
   set(ADDITIONAL_FLEX_FLAGS "")
 endif()

diff --git a/mongoose b/mongoose
diff --git a/mse/mtg_json.c b/mse/mtg_json.c
@@ -3,10 +3,14 @@
 #include "./thread_pool.h"
 #include "../testing_h/testing.h"
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
 #include <curl/curl.h>
 #include <jansson.h>
+#ifdef __WINDOWS
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
 
 size_t __mse_json_write_callback(char *ptr,
                                  size_t size,

diff --git a/mse/thread_pool.c b/mse/thread_pool.c
@@ -5,8 +5,8 @@
 #include "./thread_pool.h"
 #include "../testing_h/testing.h"
 
-#ifdef __WIN32
-#include <win32.h>
+#ifdef __WINDOWS
+#include <windows.h>
 #endif
 
 #ifdef __unix
@@ -153,7 +153,7 @@ void mse_reset_pool(mse_task_queue_t *queue)
 
 int mse_init_pool(mse_thread_pool_t *p)
 {
-#ifdef __WIN32
+#ifdef __WINDOWS
     SYSTEM_INFO sysinfo;
     GetSystemInfo(&sysinfo);
     int cpus = sysinfo.dwNumberOfProcessors;

diff --git a/web-api/server.c b/web-api/server.c
@@ -2,7 +2,8 @@
 #include "./async_query.h"
 #include "../testing_h/testing.h"
 #include <string.h>
-#include <sys/param.h>
+
+#define MIN(a, b) (a < b ? a : b)
 
 // Server state, this is global as there is only every one server
 static mse_t *mse = NULL;