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

[Tor Lillqvist]

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

New commits:
commit ab1d9ed24f22a4b840f49ba8ba6cc3a55840d3f7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Nov 5 11:10:11 2010 +0200

    Fix Windows build error
    
    Include <windows.h> explicitly, surrounded by the prewin.h and
    postwin.h headers. Also #undef ERROR to avoid a clash. Approved by
    caolan.

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index f024881..2e63f3b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -16,6 +16,13 @@
 //                 the need for manually calling regcomp and knowing what
 //                 services we need, and in what .so they are implemented
 
+#ifdef WNT
+# include <tools/prewin.h>
+# include <windows.h>
+# include <tools/postwin.h>
+# undef ERROR
+#endif
+
 #include "sal/config.h"
 
 #include <cppuhelper/bootstrap.hxx>