From f6a80bfc952c1f65af7971e07c0a7f9d0bcf37c1 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 23 Feb 2012 20:06:06 +0100
Subject: [PATCH] Small define/include fixes for compiling on windows

---
 components/files/configurationmanager.hpp | 4 ++++
 components/files/fixedpath.hpp            | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 7d77df9c0..7fb3793c6 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -1,7 +1,11 @@
 #ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 #define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 
+#ifdef _WIN32
+#include <boost/tr1/tr1/unordered_map>
+#else
 #include <tr1/unordered_map>
+#endif
 
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
diff --git a/components/files/fixedpath.hpp b/components/files/fixedpath.hpp
index 4e054b17f..9e5c4f8f2 100644
--- a/components/files/fixedpath.hpp
+++ b/components/files/fixedpath.hpp
@@ -30,7 +30,7 @@
     #include <components/files/linuxpath.hpp>
     namespace Files { typedef LinuxPath TargetPathType; }
 
-#elif defined(__WIN32) || defined(__WINDOWS__)
+#elif defined(__WIN32) || defined(__WINDOWS__) || defined(_WIN32)
     #include <components/files/windowspath.hpp>
     namespace Files { typedef WindowsPath TargetPathType; }