From 18376965808351aaecb053b503898c629a5f3953 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 24 Aug 2012 01:47:02 +0000
Subject: [PATCH] Bugfix: Move boost::interprocess Win32 workaround to
 Bitcoin-Qt sources, rather than hacking boost in gitian

---
 contrib/gitian-descriptors/boost-win32.yml | 16 ----------------
 src/qt/qtipcserver.cpp                     |  6 ++++++
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml
index d9a0bed53..c4a9f3310 100644
--- a/contrib/gitian-descriptors/boost-win32.yml
+++ b/contrib/gitian-descriptors/boost-win32.yml
@@ -17,22 +17,6 @@ script: |
   mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include
   tar xjf boost_1_49_0.tar.bz2
   cd boost_1_49_0
-  echo "--- tmp_dir_helpers.orig.hpp	2012-06-10 01:39:25.403268210 +0200
-+++ tmp_dir_helpers.hpp	2012-06-10 01:41:14.653823479 +0200
-@@ -19,9 +19,9 @@
- #include <string>
- 
- #if defined(BOOST_INTERPROCESS_WINDOWS)
--   //#define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME
--   //#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME
--   //#include <boost/interprocess/detail/win32_api.hpp>
-+   #define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME
-+   #define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME
-+   #include <boost/interprocess/detail/win32_api.hpp>
- #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
-    //#include <sys/sysctl.h>
-    //#if defined(CTL_KERN) && defined (KERN_BOOTTIME)" > useboottime.patch
-  patch boost/interprocess/detail/tmp_dir_helpers.hpp useboottime.patch
   echo "using gcc : 4.4 : i586-mingw32msvc-g++
         :
         <rc>i586-mingw32msvc-windres
diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp
index c6f9494bc..0ce9ec814 100644
--- a/src/qt/qtipcserver.cpp
+++ b/src/qt/qtipcserver.cpp
@@ -2,6 +2,12 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <boost/version.hpp>
+#if defined(WIN32) && BOOST_VERSION == 104900
+#define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME
+#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME
+#endif
+
 #include "qtipcserver.h"
 #include "guiconstants.h"
 #include "ui_interface.h"