From f9c3ac5c6a6feba0d0b9e1e0538ddbadb127f0f5 Mon Sep 17 00:00:00 2001
From: thunder2 <contact@retroshare.cc>
Date: Mon, 7 Oct 2013 23:11:10 +0000
Subject: [PATCH] Fixed compile of the libraries with MinGW 4.8 on Windows.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 src/libbitdht.pro    | 2 +-
 src/util/bdnet.h     | 2 --
 src/util/bdstring.cc | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/libbitdht.pro b/src/libbitdht.pro
index 5d5e499..44e6ba6 100644
--- a/src/libbitdht.pro
+++ b/src/libbitdht.pro
@@ -58,7 +58,7 @@ win32 {
 		QMAKE_CC = g++
 		OBJECTS_DIR = temp/obj
 		MOC_DIR = temp/moc
-		DEFINES *= STATICLIB 
+		DEFINES *= STATICLIB WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
 		# These have been replaced by _WIN32 && __MINGW32__
 		#DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW
 		DESTDIR = lib
diff --git a/src/util/bdnet.h b/src/util/bdnet.h
index 6acba29..fdc4c33 100644
--- a/src/util/bdnet.h
+++ b/src/util/bdnet.h
@@ -32,8 +32,6 @@
 /********************************** WINDOWS/UNIX SPECIFIC PART ******************/
 #if defined(_WIN32) || defined(__MINGW32__)
 
-#include <windows.h>
-#include <winsock2.h>
 #include <ws2tcpip.h>
 
 #include <stdio.h> /* for ssize_t */
diff --git a/src/util/bdstring.cc b/src/util/bdstring.cc
index 56c31ab..07fd463 100644
--- a/src/util/bdstring.cc
+++ b/src/util/bdstring.cc
@@ -23,6 +23,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#include <malloc.h>
 #else
 #include <stdarg.h>
 #include <stdlib.h>