Kaydet (Commit) 7862353a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Don't let <windows.h> define min() and max() as macros

üst d722971d
--- 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>
...@@ -60,6 +60,8 @@ PATCH_FILES+=unordered_map-doesnt-support-cp-ctor.patch ...@@ -60,6 +60,8 @@ PATCH_FILES+=unordered_map-doesnt-support-cp-ctor.patch
#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679 #http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679
PATCH_FILES+=boost.gcc47679.patch PATCH_FILES+=boost.gcc47679.patch
PATCH_FILES+=boost.windows.patch
ADDITIONAL_FILES= \ ADDITIONAL_FILES= \
libs/thread/src/win32/makefile.mk libs/thread/src/win32/makefile.mk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment