From 9bdcadb7ad138d603ee6bb8fb6c3094d656c7ae8 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Thu, 16 Aug 2012 03:03:29 +0000
Subject: [PATCH] merged build fix from RC_0_16

---
 Jamfile                       | 2 ++
 include/libtorrent/config.hpp | 4 ++++
 include/libtorrent/file.hpp   | 1 +
 3 files changed, 7 insertions(+)

diff --git a/Jamfile b/Jamfile
index 3dec17f3c..295eb85c5 100755
--- a/Jamfile
+++ b/Jamfile
@@ -63,7 +63,9 @@ rule linking ( properties * )
 		}
 	}
 
+	# dbghelp doesn't appear to exist in mingw
 	if <target-os>windows in $(properties)
+		&& ! <toolset>gcc in $(properties)
 		&& ( <asserts>on in $(properties)
 			|| <variant>debug in $(properties)
 			|| <asio-debugging>on in $(properties) )
diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index 26c4cb717..410220c10 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -50,7 +50,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #if !defined _MSC_VER || _MSC_VER >= 1600
+#ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
+#endif
 #include <stdint.h> // for INT64_MAX
 #else
 #if !defined INT64_MAX
@@ -59,7 +61,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #ifndef _MSC_VER
+#ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS 1
+#endif
 #include <inttypes.h> // for PRId64 et.al.
 #endif
 
diff --git a/include/libtorrent/file.hpp b/include/libtorrent/file.hpp
index fb1e95fc3..59aee4777 100644
--- a/include/libtorrent/file.hpp
+++ b/include/libtorrent/file.hpp
@@ -59,6 +59,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <windows.h>
 #include <winioctl.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #else
 // posix part
 #define _FILE_OFFSET_BITS 64