Merge pull request #46 from MissouriMRDT/hotfix/windows-native-build

Make Native Windows Builds Possible

src/RoveComm/RoveCommGlobals.h

@@ -20,7 +20,6 @@
 #include <cstring>
 #include <functional>
 #include <iostream>
-#include <unistd.h>
 #include <vector>
 
 /// \endcond

src/RoveComm/RoveCommPacket.h

@@ -20,6 +20,7 @@
 #include <vector>
 
 #if defined(__ROVECOMM_WINDOWS_MODE__) && __ROVECOMM_WINDOWS_MODE__ == 1
+typedef int ssize_t;
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0600
 #elif _WIN32_WINNT < 0x0600
@@ -28,6 +29,7 @@
 #endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include <windows.h>
 #else
 #include <arpa/inet.h>
 #include <fcntl.h>

src/RoveComm/RoveCommTCP.cpp

@@ -122,15 +122,15 @@ namespace rovecomm
         if (bind(m_nTCPSocket.load(), (struct sockaddr*) &m_saTCPServerAddr, sizeof(m_saTCPServerAddr)) == -1)
         {
             perror("Failed to bind TCP socket");
-            close(m_nTCPSocket);
+            CLOSE_SOCKET(m_nTCPSocket);
             return false;
         }
 
         // Listen for incoming connections
         if (listen(m_nTCPSocket, 5) == -1)
         {
             perror("Failed to listen on TCP socket");
-            close(m_nTCPSocket);
+            CLOSE_SOCKET(m_nTCPSocket);
             return false;
         }
 
@@ -178,15 +178,15 @@ namespace rovecomm
         if (inet_pton(AF_INET, cClientIPAddress, &saClientAddr.sin_addr) <= 0)
         {
             perror("Invalid address/ Address not supported");
-            close(nClientSocket);
+            CLOSE_SOCKET(nClientSocket);
             return -1;
         }
 
         // Connect to the client
         if (connect(nClientSocket, (struct sockaddr*) &saClientAddr, sizeof(saClientAddr)) == -1)
         {
             perror("Connection failed");
-            close(nClientSocket);
+            CLOSE_SOCKET(nClientSocket);
             return -1;
         }
 
@@ -209,7 +209,7 @@ namespace rovecomm
         }
 
         // Close the client socket
-        close(nClientSocket);
+        CLOSE_SOCKET(nClientSocket);
 
         return siBytesSent;
     }
@@ -483,7 +483,7 @@ namespace rovecomm
                 }
 
                 // Close the client socket
-                close(m_nCurrentTCPClientSocket);
+                CLOSE_SOCKET(m_nCurrentTCPClientSocket);
                 m_nCurrentTCPClientSocket = -1;
             }
             // Still waiting for data or connection return without error.

src/RoveComm/RoveCommTCP.h

@@ -26,7 +26,6 @@
 #include <functional>
 #include <iostream>
 #include <shared_mutex>
-#include <unistd.h>
 #include <vector>
 
 /// \endcond

src/RoveComm/RoveCommUDP.cpp

@@ -124,7 +124,7 @@ namespace rovecomm
         if (bind(m_nUDPSocket.load(), (struct sockaddr*) &saServerAddr, sizeof(saServerAddr)) == -1)
         {
             perror("Failed to bind UDP socket");
-            close(m_nUDPSocket);
+            CLOSE_SOCKET(m_nUDPSocket);
             return false;
         }
 

src/RoveComm/RoveCommUDP.h

@@ -25,7 +25,6 @@
 #include <functional>
 #include <iostream>
 #include <shared_mutex>
-#include <unistd.h>
 #include <unordered_set>
 #include <vector>