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

---
 P25Gateway/P25Gateway.cpp     | 1 +
 P25Gateway/P25Gateway.h       | 2 +-
 P25Gateway/StopWatch.h        | 1 +
 P25Gateway/Thread.h           | 1 +
 P25Gateway/UDPSocket.h        | 1 -
 P25Gateway/Version.h          | 2 +-
 P25Parrot/StopWatch.h         | 1 +
 P25Parrot/UDPSocket.h         | 1 -
 P25Parrot/Version.h           | 2 +-
 P25Reflector/Mutex.h          | 1 +
 P25Reflector/P25Reflector.cpp | 1 +
 P25Reflector/P25Reflector.h   | 2 +-
 P25Reflector/StopWatch.h      | 1 +
 P25Reflector/Thread.h         | 1 +
 P25Reflector/UDPSocket.h      | 1 -
 P25Reflector/Version.h        | 2 +-
 16 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/P25Gateway/P25Gateway.cpp b/P25Gateway/P25Gateway.cpp
index 910be99..6029836 100644
--- a/P25Gateway/P25Gateway.cpp
+++ b/P25Gateway/P25Gateway.cpp
@@ -29,6 +29,7 @@
 #include "Log.h"
 
 #if defined(_WIN32) || defined(_WIN64)
+#include <WS2tcpip.h>
 #include <Windows.h>
 #else
 #include <sys/socket.h>
diff --git a/P25Gateway/P25Gateway.h b/P25Gateway/P25Gateway.h
index 4fe4d50..d1b4995 100644
--- a/P25Gateway/P25Gateway.h
+++ b/P25Gateway/P25Gateway.h
@@ -35,7 +35,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #else
-#include <winsock.h>
+#include <WS2tcpip.h>
 #endif
 
 class CP25Gateway
diff --git a/P25Gateway/StopWatch.h b/P25Gateway/StopWatch.h
index 3f8fa19..b628392 100644
--- a/P25Gateway/StopWatch.h
+++ b/P25Gateway/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/P25Gateway/Thread.h b/P25Gateway/Thread.h
index 352d938..6be7a06 100644
--- a/P25Gateway/Thread.h
+++ b/P25Gateway/Thread.h
@@ -20,6 +20,7 @@
 #define	THREAD_H
 
 #if defined(_WIN32) || defined(_WIN64)
+#include <WS2tcpip.h>
 #include <windows.h>
 #else
 #include <pthread.h>
diff --git a/P25Gateway/UDPSocket.h b/P25Gateway/UDPSocket.h
index b22eefc..3f5585b 100644
--- a/P25Gateway/UDPSocket.h
+++ b/P25Gateway/UDPSocket.h
@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
diff --git a/P25Gateway/Version.h b/P25Gateway/Version.h
index a988871..3e08686 100644
--- a/P25Gateway/Version.h
+++ b/P25Gateway/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/P25Parrot/StopWatch.h b/P25Parrot/StopWatch.h
index 3f8fa19..b628392 100644
--- a/P25Parrot/StopWatch.h
+++ b/P25Parrot/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/P25Parrot/UDPSocket.h b/P25Parrot/UDPSocket.h
index b22eefc..3f5585b 100644
--- a/P25Parrot/UDPSocket.h
+++ b/P25Parrot/UDPSocket.h
@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
diff --git a/P25Parrot/Version.h b/P25Parrot/Version.h
index 66ae165..a718af3 100644
--- a/P25Parrot/Version.h
+++ b/P25Parrot/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/P25Reflector/Mutex.h b/P25Reflector/Mutex.h
index 7ce9f85..d4c91b8 100644
--- a/P25Reflector/Mutex.h
+++ b/P25Reflector/Mutex.h
@@ -20,6 +20,7 @@
 #define	MUTEX_H
 
 #if defined(_WIN32) || defined(_WIN64)
+#include <WS2tcpip.h>
 #include <windows.h>
 #else
 #include <pthread.h>
diff --git a/P25Reflector/P25Reflector.cpp b/P25Reflector/P25Reflector.cpp
index 4b1e9d3..e311901 100644
--- a/P25Reflector/P25Reflector.cpp
+++ b/P25Reflector/P25Reflector.cpp
@@ -26,6 +26,7 @@
 #include "Log.h"
 
 #if defined(_WIN32) || defined(_WIN64)
+#include <WS2tcpip.h>
 #include <Windows.h>
 #else
 #include <sys/socket.h>
diff --git a/P25Reflector/P25Reflector.h b/P25Reflector/P25Reflector.h
index 2efbac0..dbe1788 100644
--- a/P25Reflector/P25Reflector.h
+++ b/P25Reflector/P25Reflector.h
@@ -35,7 +35,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #else
-#include <winsock.h>
+#include <WS2tcpip.h>
 #endif
 
 class CP25Repeater {
diff --git a/P25Reflector/StopWatch.h b/P25Reflector/StopWatch.h
index 3f8fa19..b628392 100644
--- a/P25Reflector/StopWatch.h
+++ b/P25Reflector/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/P25Reflector/Thread.h b/P25Reflector/Thread.h
index 352d938..6be7a06 100644
--- a/P25Reflector/Thread.h
+++ b/P25Reflector/Thread.h
@@ -20,6 +20,7 @@
 #define	THREAD_H
 
 #if defined(_WIN32) || defined(_WIN64)
+#include <WS2tcpip.h>
 #include <windows.h>
 #else
 #include <pthread.h>
diff --git a/P25Reflector/UDPSocket.h b/P25Reflector/UDPSocket.h
index b22eefc..3f5585b 100644
--- a/P25Reflector/UDPSocket.h
+++ b/P25Reflector/UDPSocket.h
@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #else
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
diff --git a/P25Reflector/Version.h b/P25Reflector/Version.h
index 78513c7..e72ac9d 100644
--- a/P25Reflector/Version.h
+++ b/P25Reflector/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200908";
+const char* VERSION = "20200920";
 
 #endif