From 4c78c1454bcdd4cbf7f6b889748497c679bdc7a2 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sun, 20 Sep 2020 14:56:00 +0100
Subject: [PATCH] Fix Windows compilation.

---
 YSFGateway/APRSWriter.h     | 2 +-
 YSFGateway/UDPSocket.h      | 1 -
 YSFGateway/Version.h        | 2 +-
 YSFParrot/StopWatch.h       | 1 +
 YSFParrot/UDPSocket.h       | 1 -
 YSFParrot/Version.h         | 2 +-
 YSFReflector/StopWatch.h    | 1 +
 YSFReflector/UDPSocket.h    | 1 -
 YSFReflector/Version.h      | 2 +-
 YSFReflector/YSFReflector.h | 4 ++--
 10 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/YSFGateway/APRSWriter.h b/YSFGateway/APRSWriter.h
index 8f46f35..daf90e4 100644
--- a/YSFGateway/APRSWriter.h
+++ b/YSFGateway/APRSWriter.h
@@ -37,7 +37,7 @@
 #include <gps.h>
 #endif
 #else
-#include <winsock.h>
+#include <ws2tcpip.h>
 #endif
 
 class CAPRSWriter {
diff --git a/YSFGateway/UDPSocket.h b/YSFGateway/UDPSocket.h
index b22eefc..3f5585b 100644
--- a/YSFGateway/UDPSocket.h
+++ b/YSFGateway/UDPSocket.h
@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
diff --git a/YSFGateway/Version.h b/YSFGateway/Version.h
index 3102ae7..3e08686 100644
--- a/YSFGateway/Version.h
+++ b/YSFGateway/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200908";
+const char* VERSION = "20200920";
 
 #endif
diff --git a/YSFParrot/StopWatch.h b/YSFParrot/StopWatch.h
index 3f8fa19..b628392 100644
--- a/YSFParrot/StopWatch.h
+++ b/YSFParrot/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/YSFParrot/UDPSocket.h b/YSFParrot/UDPSocket.h
index b22eefc..3f5585b 100644
--- a/YSFParrot/UDPSocket.h
+++ b/YSFParrot/UDPSocket.h
@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
diff --git a/YSFParrot/Version.h b/YSFParrot/Version.h
index cf9d8b9..a718af3 100644
--- a/YSFParrot/Version.h
+++ b/YSFParrot/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200905";
+const char* VERSION = "20200920";
 
 #endif
diff --git a/YSFReflector/StopWatch.h b/YSFReflector/StopWatch.h
index 3f8fa19..b628392 100644
--- a/YSFReflector/StopWatch.h
+++ b/YSFReflector/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/YSFReflector/UDPSocket.h b/YSFReflector/UDPSocket.h
index b22eefc..3f5585b 100644
--- a/YSFReflector/UDPSocket.h
+++ b/YSFReflector/UDPSocket.h
@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
diff --git a/YSFReflector/Version.h b/YSFReflector/Version.h
index cf9d8b9..a718af3 100644
--- a/YSFReflector/Version.h
+++ b/YSFReflector/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200905";
+const char* VERSION = "20200920";
 
 #endif
diff --git a/YSFReflector/YSFReflector.h b/YSFReflector/YSFReflector.h
index 2a6b802..0da41a0 100644
--- a/YSFReflector/YSFReflector.h
+++ b/YSFReflector/YSFReflector.h
@@ -1,5 +1,5 @@
 /*
-*   Copyright (C) 2016 by Jonathan Naylor G4KLX
+*   Copyright (C) 2016,2020 by Jonathan Naylor G4KLX
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #else
-#include <winsock.h>
+#include <WS2tcpip.h>
 #endif
 
 class CYSFRepeater {