summaryrefslogtreecommitdiff
path: root/boost/makefile.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-07-15 15:16:30 +0300
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2011-07-21 10:42:24 +0200
commit0fa05fcc47b6eb4750cad95830d62557d76d2816 (patch)
treeb9a5ff6cd840c37008a755aa527f7f68c3de15ac /boost/makefile.mk
parent2567e45112b187cddd6056cd450d9670ed94c760 (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>
Diffstat (limited to 'boost/makefile.mk')
-rw-r--r--boost/makefile.mk2
1 files changed, 2 insertions, 0 deletions
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