Merge pull request #47 from MissouriMRDT/hotfix/macros

Fix Typedef Conflict
MissouriMRDT · Oct 30, 2024 · 5d17cd5 · 5d17cd5
2 parents 92844aa + 219b8d9
commit 5d17cd5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/RoveComm/RoveCommPacket.h b/src/RoveComm/RoveCommPacket.h
@@ -20,16 +20,18 @@
 #include <vector>
 
 #if defined(__ROVECOMM_WINDOWS_MODE__) && __ROVECOMM_WINDOWS_MODE__ == 1
+#if !defined(ssize_t) && defined(_MSC_VER)
 typedef int ssize_t;
+#endif
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0600
 #elif _WIN32_WINNT < 0x0600
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0600
 #endif
+#include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <windows.h>
 #else
 #include <arpa/inet.h>
 #include <fcntl.h>