[Libreoffice-commits] .: Branch 'libreoffice-3-4-2' - sc/qa

[Markus Mohrhard]

 sc/qa/unit/ucalc.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 4ef89b3893e7fbe159799e627aefb0fe1cf9c6bc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jul 21 09:23:19 2011 +0200

    Avoid confusion with our windows api clash prevention
    
    (cherry picked from commit a027bee4bb2565f14eb70c4325592b23a86c007a)
    
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 835f085..56efc6c 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>