Make compilation work with MS Visual Studio on Windows (#32)

Author: sinisa-susnjar

cmake/CompilerWarnings.cmake

@@ -21,7 +21,7 @@ function(set_project_c_warnings library_name)
     set(C_PROJECT_WARNINGS ${CLANG_C_WARNINGS})
   elseif(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
     set(C_PROJECT_WARNINGS ${CLANG_C_WARNINGS})
-  else()
+  elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set(C_PROJECT_WARNINGS ${GCC_C_WARNINGS})
   endif()
 
@@ -53,7 +53,7 @@ function(set_project_cpp_warnings library_name)
     set(CPP_PROJECT_WARNINGS ${CLANG_CPP_WARNINGS})
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set(CPP_PROJECT_WARNINGS ${CLANG_CPP_WARNINGS})
-  else()
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(CPP_PROJECT_WARNINGS ${GCC_CPP_WARNINGS})
   endif()
 

src/mgallocator.c

@@ -20,6 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef _MSC_VER
+typedef double max_align_t;
+#endif
+
 void *mg_system_realloc(struct mg_allocator *self, void *buf, size_t size) {
   (void)self;
   return realloc(buf, size);

src/mgsession.c

@@ -20,7 +20,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 
 #include "mgcommon.h"
 #include "mgconstants.h"

src/mgsocket.h

@@ -43,6 +43,9 @@ extern "C" {
 #include <Ws2tcpip.h>
 #include <windows.h>
 #include <winsock2.h>
+#ifdef _MSC_VER
+typedef long ssize_t;
+#endif
 #endif  // MGCLIENT_ON_WINDOWS
 
 #include "mgclient.h"

src/windows/mgcommon.h

@@ -17,6 +17,27 @@
 
 // Based on https://gist.github.com/PkmX/63dd23f28ba885be53a5
 
+#if defined(_MSC_VER)
+
+#include <stdlib.h>
+
+#define htobe16(x) _byteswap_ushort(x)
+#define htole16(x) (x)
+#define be16toh(x) _byteswap_ushort(x)
+#define le16toh(x) (x)
+
+#define htobe32(x) _byteswap_ulong(x)
+#define htole32(x) (x)
+#define be32toh(x) _byteswap_ulong(x)
+#define le32toh(x) (x)
+
+#define htobe64(x) _byteswap_uint64(x)
+#define htole64(x) (x)
+#define be64toh(x) _byteswap_uint64(x)
+#define le64toh(x) (x)
+
+#else
+
 #define htobe16(x) __builtin_bswap16(x)
 #define htole16(x) (x)
 #define be16toh(x) __builtin_bswap16(x)
@@ -33,3 +54,5 @@
 #define le64toh(x) (x)
 
 #endif
+
+#endif