From c7b67d9c3c0a3b789976cc525b83ad506a625476 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 17 Jan 2014 12:27:54 +0100
Subject: ProtoProxy: Fixed #include filename case.

---
 Tools/ProtoProxy/Globals.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Tools/ProtoProxy/Globals.h')

diff --git a/Tools/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h
index 8424aca81..ad81e6810 100644
--- a/Tools/ProtoProxy/Globals.h
+++ b/Tools/ProtoProxy/Globals.h
@@ -211,10 +211,10 @@ public:
 
 
 
-#include "CryptoPP/randpool.h"
-#include "CryptoPP/aes.h"
-#include "CryptoPP/rsa.h"
-#include "CryptoPP/modes.h"
+#include "cryptopp/randpool.h"
+#include "cryptopp/aes.h"
+#include "cryptopp/rsa.h"
+#include "cryptopp/modes.h"
 
 using namespace CryptoPP;
 
-- 
cgit v1.2.3


From c4f4eda3474bceff61fa275c416e57fe8a3de7fa Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 17 Jan 2014 12:38:25 +0100
Subject: ProtoProxy: Fixed compilation in Windows and in Linux.

---
 Tools/ProtoProxy/Globals.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Tools/ProtoProxy/Globals.h')

diff --git a/Tools/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h
index ad81e6810..2b39bfae3 100644
--- a/Tools/ProtoProxy/Globals.h
+++ b/Tools/ProtoProxy/Globals.h
@@ -123,6 +123,12 @@ typedef unsigned short     UInt16;
 	#include <semaphore.h>
 	#include <errno.h>
 	#include <fcntl.h>
+	
+	typedef SOCKET int;
+	enum
+	{
+		INVALID_SOCKET = -1,
+	};
 #if !defined(ANDROID_NDK)
 	#include <tr1/memory>
 #endif
-- 
cgit v1.2.3


From b99fe7d8121d13a526bfb0f972ed8d7b3a6511b1 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 17 Jan 2014 12:39:19 +0100
Subject: ProtoProxy: Fixed inversed typedef.

I must be going crazy...
---
 Tools/ProtoProxy/Globals.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Tools/ProtoProxy/Globals.h')

diff --git a/Tools/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h
index 2b39bfae3..fab6adc5b 100644
--- a/Tools/ProtoProxy/Globals.h
+++ b/Tools/ProtoProxy/Globals.h
@@ -124,7 +124,7 @@ typedef unsigned short     UInt16;
 	#include <errno.h>
 	#include <fcntl.h>
 	
-	typedef SOCKET int;
+	typedef int SOCKET;
 	enum
 	{
 		INVALID_SOCKET = -1,
-- 
cgit v1.2.3


From 1aeecdbe43fbcd839e3a4927bfad9a5d8ae5dad7 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 17 Jan 2014 13:15:54 +0100
Subject: ProtoProxy: Compiles under Linux.

---
 Tools/ProtoProxy/Globals.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Tools/ProtoProxy/Globals.h')

diff --git a/Tools/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h
index fab6adc5b..7415c9e62 100644
--- a/Tools/ProtoProxy/Globals.h
+++ b/Tools/ProtoProxy/Globals.h
@@ -95,6 +95,7 @@ typedef unsigned short     UInt16;
 	#define WIN32_LEAN_AND_MEAN
 	#include <Windows.h>
 	#include <winsock2.h>
+	#include <ws2tcpip.h>
 	
 	// Windows SDK defines min and max macros, messing up with our std::min and std::max usage
 	#undef min
@@ -104,6 +105,8 @@ typedef unsigned short     UInt16;
 	#ifdef GetFreeSpace
 		#undef GetFreeSpace
 	#endif  // GetFreeSpace
+	
+	#define SocketError WSAGetLastError()
 #else
 	#include <sys/types.h>
 	#include <sys/stat.h>   // for mkdir
@@ -116,6 +119,7 @@ typedef unsigned short     UInt16;
 	#include <dirent.h>
 	#include <errno.h>
 	#include <iostream>
+	#include <unistd.h>
 
 	#include <cstdio>
 	#include <cstring>
@@ -129,6 +133,8 @@ typedef unsigned short     UInt16;
 	{
 		INVALID_SOCKET = -1,
 	};
+	#define closesocket close
+	#define SocketError errno
 #if !defined(ANDROID_NDK)
 	#include <tr1/memory>
 #endif
-- 
cgit v1.2.3