- minor fixes for Windows build integrated into HASQ

src/engine/helper/HL_NetworkFrame.h

@@ -35,7 +35,11 @@ public:
     uint16_t  mEtherType; /* IP? ARP? RARP? etc */
   };
 
+#if defined(TARGET_WIN)
+  struct /*__attribute__((packed))*/ LinuxSllHeader
+#else
   struct __attribute__((packed)) LinuxSllHeader
+#endif
   {
     uint16_t mPacketType;
     uint16_t mARPHRD;

src/engine/helper/HL_NetworkSocket.cpp

@@ -14,7 +14,9 @@
 # include <fcntl.h>
 #endif
 
-#include <unistd.h>
+#if !defined(TARGET_WIN)
+# include <unistd.h>
+#endif
 #include <assert.h>
 
 DatagramSocket::DatagramSocket()

src/engine/helper/HL_Rtp.cpp

@@ -9,7 +9,9 @@
 
 #include "jrtplib/src/rtprawpacket.h"
 #include "jrtplib/src/rtpipv4address.h"
-#include <alloca.h>
+#if !defined(TARGET_WIN)
+# include <alloca.h>
+#endif
 #include <sstream>
 #include <tuple>
 

src/engine/helper/HL_SocketHeap.cpp

@@ -10,7 +10,10 @@
 #endif
 #include <set>
 #include <assert.h>
-#include <unistd.h> // Responsible for close() call on Linux
+
+#if !defined(TARGET_WIN)
+# include <unistd.h> // Responsible for close() call on Linux
+#endif
 
 #include "HL_SocketHeap.h"
 #include "HL_Log.h"

src/engine/helper/HL_Uuid.cpp

@@ -4,7 +4,7 @@
 Uuid::Uuid()
 {
 #if defined(TARGET_WIN) || defined(TARGET_LINUX) || defined(TARGET_OSX)
-  memset(mUuid, 0, sizeof mUuid);
+  memset(&mUuid, 0, sizeof mUuid);
 #endif
 }