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 | 3e8b12302457a9cbd5e0113c8e0a21f4753b51d2 (patch) | |
| tree | 01d5668f2938a0bb4a9b01b82301c64625dd444f | |
| parent | 5afa5a4d59a26ad1dc4a0bd0683aefd7c92bbd26 (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 e589ec004871..7b1c9b45aa75 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> |