diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-15 15:16:30 +0300 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-07-21 10:42:24 +0200 |
| commit | 0fa05fcc47b6eb4750cad95830d62557d76d2816 (patch) | |
| tree | b9a5ff6cd840c37008a755aa527f7f68c3de15ac | |
| parent | 2567e45112b187cddd6056cd450d9670ed94c760 (diff) | |
Don't let <windows.h> define min() and max() as macros
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | boost/boost.windows.patch | 12 | ||||
| -rw-r--r-- | boost/makefile.mk | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/boost/boost.windows.patch b/boost/boost.windows.patch new file mode 100644 index 000000000000..c0054c8de244 --- /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 b1f054b64e67..b9feb7b9540a 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 |