From e958203b11bf3955a854c7fcbf630ab3d1a9c6d7 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sun, 20 Sep 2020 15:35:36 +0100
Subject: [PATCH] Fix Windows compilation.

---
 NXDNGateway/APRSWriter.h  | 2 +-
 NXDNGateway/RptNetwork.h  | 2 +-
 NXDNGateway/StopWatch.h   | 1 +
 NXDNGateway/UDPSocket.h   | 1 -
 NXDNGateway/Version.h     | 2 +-
 NXDNParrot/StopWatch.h    | 1 +
 NXDNParrot/UDPSocket.h    | 3 +--
 NXDNParrot/Version.h      | 2 +-
 NXDNReflector/StopWatch.h | 1 +
 NXDNReflector/UDPSocket.h | 1 -
 NXDNReflector/Version.h   | 2 +-
 11 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NXDNGateway/APRSWriter.h b/NXDNGateway/APRSWriter.h
index 3a65122..b4a113c 100644
--- a/NXDNGateway/APRSWriter.h
+++ b/NXDNGateway/APRSWriter.h
@@ -37,7 +37,7 @@
 #include <gps.h>
 #endif
 #else
-#include <winsock.h>
+#include <WS2tcpip.h>
 #endif
 
 class CAPRSWriter {
diff --git a/NXDNGateway/RptNetwork.h b/NXDNGateway/RptNetwork.h
index 8cdedac..5efbdc9 100644
--- a/NXDNGateway/RptNetwork.h
+++ b/NXDNGateway/RptNetwork.h
@@ -29,7 +29,7 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock.h>
+#include <WS2tcpip.h>
 #endif
 
 #include <cstdint>
diff --git a/NXDNGateway/StopWatch.h b/NXDNGateway/StopWatch.h
index 3f8fa19..b628392 100644
--- a/NXDNGateway/StopWatch.h
+++ b/NXDNGateway/StopWatch.h
@@ -20,6 +20,7 @@
 #define	STOPWATCH_H
 
 #if defined(_WIN32) || defined(_WIN64)
+#include <WS2tcpip.h>
 #include <windows.h>
 #else
 #include <sys/time.h>
diff --git a/NXDNGateway/UDPSocket.h b/NXDNGateway/UDPSocket.h
index b22eefc..3f5585b 100644
--- a/NXDNGateway/UDPSocket.h
+++ b/NXDNGateway/UDPSocket.h
@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
diff --git a/NXDNGateway/Version.h b/NXDNGateway/Version.h
index b3a94e5..5e2b52b 100644
--- a/NXDNGateway/Version.h
+++ b/NXDNGateway/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200906";
+const char* VERSION = "20200920";
 
 #endif
diff --git a/NXDNParrot/StopWatch.h b/NXDNParrot/StopWatch.h
index 3f8fa19..b628392 100644
--- a/NXDNParrot/StopWatch.h
+++ b/NXDNParrot/StopWatch.h
@@ -20,6 +20,7 @@
 #define	STOPWATCH_H
 
 #if defined(_WIN32) || defined(_WIN64)
+#include <WS2tcpip.h>
 #include <windows.h>
 #else
 #include <sys/time.h>
diff --git a/NXDNParrot/UDPSocket.h b/NXDNParrot/UDPSocket.h
index b22eefc..6df7d79 100644
--- a/NXDNParrot/UDPSocket.h
+++ b/NXDNParrot/UDPSocket.h
@@ -32,8 +32,7 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
-#include <ws2tcpip.h>
+#include <WS2tcpip.h>
 #endif
 
 #if !defined(UDP_SOCKET_MAX)
diff --git a/NXDNParrot/Version.h b/NXDNParrot/Version.h
index 8d2d1c1..10e1e36 100644
--- a/NXDNParrot/Version.h
+++ b/NXDNParrot/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200906";
+const char* VERSION = "20200920";
 
 #endif
diff --git a/NXDNReflector/StopWatch.h b/NXDNReflector/StopWatch.h
index 3f8fa19..b628392 100644
--- a/NXDNReflector/StopWatch.h
+++ b/NXDNReflector/StopWatch.h
@@ -20,6 +20,7 @@
 #define	STOPWATCH_H
 
 #if defined(_WIN32) || defined(_WIN64)
+#include <WS2tcpip.h>
 #include <windows.h>
 #else
 #include <sys/time.h>
diff --git a/NXDNReflector/UDPSocket.h b/NXDNReflector/UDPSocket.h
index b22eefc..3f5585b 100644
--- a/NXDNReflector/UDPSocket.h
+++ b/NXDNReflector/UDPSocket.h
@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
diff --git a/NXDNReflector/Version.h b/NXDNReflector/Version.h
index b52ac54..f0a8fe6 100644
--- a/NXDNReflector/Version.h
+++ b/NXDNReflector/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200908";
+const char* VERSION = "20200920";
 
 #endif