Fix Windows build of extensions

9 files changed, 51 insertions, 0 deletions

diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index 4881a610fe71..2be54b8132d1 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -35,6 +35,12 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#undef OPTIONAL
+#endif
+
 #include <cstdarg>
 #include <cstdio>
 
diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx
index 4f1db5bd3e7e..48d5455de0b3 100644
--- a/extensions/source/plugin/base/evtlstnr.cxx
+++ b/extensions/source/plugin/base/evtlstnr.cxx
@@ -35,6 +35,12 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#undef OPTIONAL
+#endif
+
 #include <cstdarg>
 
 #include <plugin/impl.hxx>
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index a261177aafaa..245f2d884f29 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -35,6 +35,12 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#undef OPTIONAL
+#endif
+
 #include <cstdarg>
 
 #include "plugin/impl.hxx"
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index 24e9939cb2ad..571ead19bae1 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -35,6 +35,12 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#undef OPTIONAL
+#endif
+
 #include <cstdarg>
 #include <list>
 
diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx
index 1b4c9fbcb312..a4fb6b4ac8c1 100644
--- a/extensions/source/plugin/base/plcom.cxx
+++ b/extensions/source/plugin/base/plcom.cxx
@@ -35,6 +35,12 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#undef OPTIONAL
+#endif
+
 #ifdef SOLARIS
 #include <limits>
 #endif
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index ac32608be0b9..2005f92ace4f 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -35,6 +35,12 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#undef OPTIONAL
+#endif
+
 #include <cstdarg>
 
 #include <plugin/impl.hxx>
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 38039f4fa7f9..5afcbbf45f07 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -33,6 +33,13 @@
 #include <sys/timer.h>
 #undef _LINUX_SOURCE_COMPAT
 #endif
+
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#undef OPTIONAL
+#endif
+
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/loader/XImplementationLoader.hpp>
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index 4059f94f3b69..ae1b34c69b47 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -29,6 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#include <prewin.h>
+#include <postwin.h>
+#undef OPTIONAL
+
 #include <plugin/impl.hxx>
 
 #pragma warning (push,1)
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index 0661bd5b526c..2312af5be19b 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -29,6 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#include <prewin.h>
+#include <postwin.h>
+#undef OPTIONAL
+
 #include "vcl/svapp.hxx"
 #include "tools/fsys.hxx"
 #include "tools/urlobj.hxx"