[Libreoffice-commits] .: extensions/source

[Fridrich Strba]

 extensions/source/plugin/base/context.cxx  |    6 ++++++
 extensions/source/plugin/base/evtlstnr.cxx |    6 ++++++
 extensions/source/plugin/base/manager.cxx  |    6 ++++++
 extensions/source/plugin/base/nfuncs.cxx   |    6 ++++++
 extensions/source/plugin/base/plcom.cxx    |    6 ++++++
 extensions/source/plugin/base/service.cxx  |    6 ++++++
 extensions/source/plugin/base/xplugin.cxx  |    7 +++++++
 extensions/source/plugin/win/sysplug.cxx   |    4 ++++
 extensions/source/plugin/win/winmgr.cxx    |    4 ++++
 9 files changed, 51 insertions(+)

New commits:
commit 00beb95cd8964165f2d9030b52371eb198619c38
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 29 21:59:45 2011 +0200

    Fix Windows build of extensions

diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index 71b75ee..bf5f954 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 9042ab6..b566f91 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 a0cde48..2806ee4 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 5543562..0d50bcf 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 dbb0d1a..ac34019 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 ae98f63..c82e543 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 606e207..8712239 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 59d008d..4d25d59 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 e0f885e..c92b310 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"