Merge branch 'IPv6' into DG-ID

YSFGateway/APRSWriter.h

@@ -37,7 +37,7 @@
 #include <gps.h>
 #endif
 #else
-#include <winsock.h>
+#include <ws2tcpip.h>
 #endif
 
 class CAPRSWriter {

YSFGateway/UDPSocket.h

@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 

YSFGateway/Version.h

@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200908";
+const char* VERSION = "20200920";
 
 #endif

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>

YSFParrot/UDPSocket.h

@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 

YSFParrot/Version.h

@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200905";
+const char* VERSION = "20200920";
 
 #endif

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>

YSFReflector/UDPSocket.h

@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 

YSFReflector/Version.h

@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200905";
+const char* VERSION = "20200920";
 
 #endif

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 {