diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-07-21 09:23:19 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-07-21 10:37:52 +0200 |
| commit | 4ef89b3893e7fbe159799e627aefb0fe1cf9c6bc (patch) | |
| tree | 6877a633ec9d0f3ee2c2b2627f28904d7ba71421 | |
| parent | 5c81236146cc24b3ae942f4be4c1c7159313f441 (diff) | |
Avoid confusion with our windows api clash prevention
(cherry picked from commit a027bee4bb2565f14eb70c4325592b23a86c007a)
Signed-off-by: Tor Lillqvist <tlillqvist@novell.com>
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 7 |
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> |