[Libreoffice-commits] .: Branch 'libreoffice-3-4-2' - boost/boost.windows.patch boost/makefile.mk

[Markus Mohrhard]

 boost/boost.windows.patch |   12 ++++++++++++
 boost/makefile.mk         |    2 ++
 2 files changed, 14 insertions(+)

New commits:
commit 4d2d3fba7ec4f820f287420b342a64a235503aac
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 15 15:16:30 2011 +0300

    Don't let <windows.h> define min() and max() as macros
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/boost/boost.windows.patch b/boost/boost.windows.patch
new file mode 100644
index 0000000..c0054c8
--- /dev/null
+++ b/boost/boost.windows.patch
@@ -0,0 +1,12 @@
+--- misc/build/boost_1_44_0/boost/pool/detail/mutex.hpp
++++ misc/build/boost_1_44_0/boost/pool/detail/mutex.hpp
+@@ -46,7 +46,9 @@
+ 
+ #ifndef BOOST_NO_MT
+ # ifdef BOOST_WINDOWS
++#  define NOMINMAX
+ #  include <windows.h>
++#  undef NOMINMAX
+ # endif
+ # if defined(_POSIX_THREADS) || defined(BOOST_HAS_PTHREADS)
+ #  include <pthread.h>
diff --git a/boost/makefile.mk b/boost/makefile.mk
index b1f054b..b9feb7b 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -60,6 +60,8 @@ PATCH_FILES+=unordered_map-doesnt-support-cp-ctor.patch
 #http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679
 PATCH_FILES+=boost.gcc47679.patch
 
+PATCH_FILES+=boost.windows.patch
+
 ADDITIONAL_FILES= \
     libs/thread/src/win32/makefile.mk