summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-07-21 09:23:19 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-07-21 11:31:57 +0300
commit81568f230ed1c31f946ea6e166dcca316d381619 (patch)
tree6b42e12dce8c986de74536c56bcaeef0efe80527
parentc82f49c06b32f0da90e53df50bb24789fffe3c9a (diff)
Avoid confusion with our windows api clash prevention
(cherry picked from commit a027bee4bb2565f14eb70c4325592b23a86c007a) Signed-off-by: Tor Lillqvist <tlillqvist@novell.com>
-rw-r--r--sc/qa/unit/ucalc.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 835f08508..56efc6cc6 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -88,6 +88,13 @@
#include <iostream>
#include <vector>
+#ifdef WNT
+#define NOMINMAX
+#include <prewin.h>
+#include <postwin.h>
+#undef NOMINMAX
+#endif
+
#define MDDS_HASH_CONTAINER_BOOST 1
#include <mdds/mixed_type_matrix.hpp>