From d0a05df1069fd41d0ed9acaf33067ee3c41b1fe2 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Thu, 9 Feb 2017 12:31:18 +0000
Subject: [PATCH] Move Convert definitions to TcpSocket.h

---
 src/openrct2/network/TcpSocket.cpp | 2 ++
 src/openrct2/network/TcpSocket.h   | 6 ++++++
 src/openrct2/network/network.h     | 6 ------
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/openrct2/network/TcpSocket.cpp b/src/openrct2/network/TcpSocket.cpp
index d593f96fec..8ee4aeaeb0 100644
--- a/src/openrct2/network/TcpSocket.cpp
+++ b/src/openrct2/network/TcpSocket.cpp
@@ -511,6 +511,8 @@ bool InitialiseWSA()
         _wsaInitialised = true;
     }
     return _wsaInitialised;
+#else
+    return true;
 #endif
 }
 
diff --git a/src/openrct2/network/TcpSocket.h b/src/openrct2/network/TcpSocket.h
index c9cf7379ce..a13df908c1 100644
--- a/src/openrct2/network/TcpSocket.h
+++ b/src/openrct2/network/TcpSocket.h
@@ -65,3 +65,9 @@ ITcpSocket * CreateTcpSocket();
 
 bool InitialiseWSA();
 void DisposeWSA();
+
+namespace Convert
+{
+    uint16 HostToNetwork(uint16 value);
+    uint16 NetworkToHost(uint16 value);
+}
diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h
index 7ee03f6af5..1667d90f7a 100644
--- a/src/openrct2/network/network.h
+++ b/src/openrct2/network/network.h
@@ -250,12 +250,6 @@ private:
 	uint8 * save_for_network(size_t &out_size, const std::vector<const ObjectRepositoryItem *> &objects) const;
 };
 
-namespace Convert
-{
-	uint16 HostToNetwork(uint16 value);
-	uint16 NetworkToHost(uint16 value);
-}
-
 #endif // __cplusplus
 #else /* DISABLE_NETWORK */
 #define NETWORK_STREAM_ID "Multiplayer disabled"