fix compilation for linux

gwdevhub · Aug 13, 2024 · 85a6860 · 85a6860
1 parent 25f9d0a
commit 85a6860
Showing 1 changed file with 53 additions and 66 deletions.
diff --git a/GuildWarsPartySearch.Bot/Dependencies/easywsclient/easywsclient.cpp b/GuildWarsPartySearch.Bot/Dependencies/easywsclient/easywsclient.cpp
@@ -1,70 +1,59 @@
-#ifdef _WIN32
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
 #include <fcntl.h>
-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#pragma comment(lib, "ws2_32")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <vector>
+#include <string>
+#include <cstdint>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
-#include <io.h>
-#ifndef _SSIZE_T_DEFINED
-typedef int ssize_t;
-#define _SSIZE_T_DEFINED
-#endif
-#ifndef _SOCKET_T_DEFINED
-typedef SOCKET socket_t;
-#define _SOCKET_T_DEFINED
-#endif
-#ifndef snprintf
-#define snprintf _snprintf_s
-#endif
-#if _MSC_VER >=1600
-#include <stdint.h>
-#else
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#endif
-#define socketerrno WSAGetLastError()
-#define SOCKET_EAGAIN_EINPROGRESS WSAEINPROGRESS
-#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
+
+#ifdef _WIN32
+    #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
+        #define _CRT_SECURE_NO_WARNINGS
+    #endif
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
+    #include <WinSock2.h>
+    #include <WS2tcpip.h>
+    #pragma comment(lib, "ws2_32")
+    #include <io.h>
+    #ifndef _SSIZE_T_DEFINED
+        typedef int ssize_t;
+        #define _SSIZE_T_DEFINED
+    #endif
+    #ifndef _SOCKET_T_DEFINED
+        typedef SOCKET socket_t;
+        #define _SOCKET_T_DEFINED
+    #endif
+    #ifndef snprintf
+        #define snprintf _snprintf_s
+    #endif
+    #define socketerrno WSAGetLastError()
+    #define SOCKET_EAGAIN_EINPROGRESS WSAEINPROGRESS
+    #define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
 #else
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/tcp.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdint.h>
-#ifndef _SOCKET_T_DEFINED
-typedef int socket_t;
-#define _SOCKET_T_DEFINED
-#endif
-#ifndef INVALID_SOCKET
-#define INVALID_SOCKET (-1)
-#endif
-#ifndef SOCKET_ERROR
-#define SOCKET_ERROR   (-1)
-#endif
-#define closesocket(s) ::close(s)
-#include <errno.h>
-#define socketerrno errno
-#define SOCKET_EAGAIN_EINPROGRESS EAGAIN
-#define SOCKET_EWOULDBLOCK EWOULDBLOCK
+    #include <netdb.h>
+    #include <netinet/tcp.h>
+    #include <sys/socket.h>
+    #include <sys/time.h>
+    #include <unistd.h>
+    #ifndef _SOCKET_T_DEFINED
+        typedef int socket_t;
+        #define _SOCKET_T_DEFINED
+    #endif
+    #ifndef INVALID_SOCKET
+        #define INVALID_SOCKET (-1)
+    #endif
+    #ifndef SOCKET_ERROR
+        #define SOCKET_ERROR   (-1)
+    #endif
+    #define closesocket(s) ::close(s)
+    #include <errno.h>
+    #define socketerrno errno
+    #define SOCKET_EAGAIN_EINPROGRESS EAGAIN
+    #define SOCKET_EWOULDBLOCK EWOULDBLOCK
 #endif
 
 #include <mbedtls/ssl.h>
@@ -74,8 +63,6 @@ typedef int socket_t;
 #include <mbedtls/x509_crt.h>
 #include <mbedtls/error.h>
 #include <mbedtls/debug.h>
-#include <vector>
-#include <string>
 
 #include "easywsclient.hpp"