From 34352253d80ebd8c0ce9f368bcb6759eed4eee9b Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Sat, 27 Dec 2014 23:22:33 +0300 Subject: Fix boost https://github.com/boostorg/interprocess/pull/15 --- src/boost-2-fixes.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/boost-2-fixes.patch diff --git a/src/boost-2-fixes.patch b/src/boost-2-fixes.patch new file mode 100644 index 0000000..42cdf1f --- /dev/null +++ b/src/boost-2-fixes.patch @@ -0,0 +1,48 @@ +diff -urN boost_1_57_0.orig/boost/interprocess/detail/win32_api.hpp boost_1_57_0/boost/interprocess/detail/win32_api.hpp +--- boost_1_57_0.orig/boost/interprocess/detail/win32_api.hpp 2014-10-18 19:58:22.000000000 +0400 ++++ boost_1_57_0/boost/interprocess/detail/win32_api.hpp 2014-12-27 21:48:50.726444568 +0300 +@@ -28,11 +28,18 @@ + #include + #include + ++#if defined (BOOST_INTERPROCESS_WINDOWS) ++# include ++# include ++#else ++# error "This file can only be included in Windows OS" ++#endif ++ + #ifdef BOOST_USE_WINDOWS_H + #include +-#include +-#include +-#include ++#include ++#include ++#include + #endif + + #if defined(_MSC_VER) +@@ -44,13 +51,6 @@ + # pragma comment( lib, "Shell32.lib" ) //SHGetSpecialFolderPathA + #endif + +-#if defined (BOOST_INTERPROCESS_WINDOWS) +-# include +-# include +-#else +-# error "This file can only be included in Windows OS" +-#endif +- + ////////////////////////////////////////////////////////////////////////////// + // + // Declaration of Windows structures or typedefs if BOOST_USE_WINDOWS_H is used +@@ -2252,7 +2252,7 @@ + // Print the contents of each record in the buffer. + if(find_record_in_buffer(heap_deleter.get(), dwBytesRead, provider_name, event_id, pTypedRecord)){ + char stamp_str[sizeof(unsigned long)*3+1]; +- std::sprintf(&stamp_str[0], "%u", ((unsigned int)pTypedRecord->TimeGenerated)); ++ sprintf(&stamp_str[0], "%u", ((unsigned int)pTypedRecord->TimeGenerated)); + stamp = stamp_str; + break; + } -- cgit v0.12