From e3d04ff96d44040dab91d5a60393710961a44a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Thu, 2 Jun 2016 10:13:25 +0200
Subject: [PATCH] Fix TcpSocket for Linux compilers (#13)

---
 src/network/NetworkConnection.cpp |  2 +-
 src/network/TcpSocket.cpp         | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/network/NetworkConnection.cpp b/src/network/NetworkConnection.cpp
index d73e8e7cf6b5..4d5081deba7b 100644
--- a/src/network/NetworkConnection.cpp
+++ b/src/network/NetworkConnection.cpp
@@ -16,7 +16,7 @@
 
 #ifndef DISABLE_NETWORK
 
-#include "Network.h"
+#include "network.h"
 #include "NetworkConnection.h"
 #include "../core/String.hpp"
 #include <SDL.h>
diff --git a/src/network/TcpSocket.cpp b/src/network/TcpSocket.cpp
index c4df39683757..c9598d524c3e 100644
--- a/src/network/TcpSocket.cpp
+++ b/src/network/TcpSocket.cpp
@@ -74,7 +74,7 @@ class SocketException : public Exception
 
 struct ConnectRequest
 {
-    TcpSocket * TcpSocket;
+    TcpSocket * Socket;
     std::string Address;
     uint16      Port;
 };
@@ -309,7 +309,7 @@ class TcpSocket : public ITcpSocket
         {
             // Spin off a worker thread for resolving the address
             auto req = new ConnectRequest();
-            req->TcpSocket = this;
+            req->Socket = this;
             req->Address = std::string(address);
             req->Port = port;
             SDL_CreateThread([](void * pointer) -> int
@@ -317,15 +317,15 @@ class TcpSocket : public ITcpSocket
                 auto req = (ConnectRequest *)pointer;
                 try
                 {
-                    req->TcpSocket->Connect(req->Address.c_str(), req->Port);
+                    req->Socket->Connect(req->Address.c_str(), req->Port);
                 }
                 catch (Exception ex)
                 {
-                    req->TcpSocket->_error = std::string(ex.GetMsg());
+                    req->Socket->_error = std::string(ex.GetMsg());
                 }
                 delete req;
- 
-                SDL_UnlockMutex(req->TcpSocket->_connectMutex);
+
+                SDL_UnlockMutex(req->Socket->_connectMutex);
                 return 0;
             }, 0, req);
         }
@@ -386,7 +386,7 @@ class TcpSocket : public ITcpSocket
         }
     }
 
-    void Close()
+    void Close() override
     {
         SDL_LockMutex(_connectMutex);
         {