summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2010-11-05 11:10:11 +0200
committerTor Lillqvist <tml@hemulen.(none)>2010-11-09 15:09:05 +0200
commitab1d9ed24f22a4b840f49ba8ba6cc3a55840d3f7 (patch)
tree2d3264a78214a6e9399bd137beced06cfe9af877
parent3a06b860b69fdbe25317b44c4b13581bd88e736c (diff)
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.
-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 f02488136..2e63f3bf0 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>