Temporarily put back prewin.h/postwin.h hack in tools and vcl

22 files changed, 30 insertions, 22 deletions

diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index dacd5156d69c..a8cf619f21bf 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -34,6 +34,10 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <stdio.h>
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#endif
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 94513645bc8f..abcf616a2a90 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -31,9 +31,7 @@
 #include <com/sun/star/lang/SystemDependent.hpp>
 #include <com/sun/star/awt/SystemDependentXWindow.hpp>
 
-#ifdef WNT
-#include <windows.h>
-#elif defined ( QUARTZ )
+#if defined ( QUARTZ )
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 186b65c3d68f..3039e11c3895 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -37,7 +37,8 @@
 #include <vcl/window.hxx>
 
 #ifdef WNT
-#include <windows.h>
+#include <prewin.h>
+#include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 782c6d1efc69..75fd77bbaf73 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -28,6 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+#include <svsys.h>
 #include "tools/debug.hxx"
 #include "i18npool/mslangid.hxx"
 #include "vcl/svapp.hxx"
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 3f7b6a9535dd..655bb0393563 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -30,6 +30,7 @@
 #include "precompiled_vcl.hxx"
 
 #ifdef WNT
+#include <svsys.h>
 #include <process.h>    // for _beginthreadex
 #include <ole2.h>   // for _beginthreadex
 #endif
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 6b72f96e7eb6..ab5b59025724 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -53,9 +53,7 @@
 #include <deque>
 
 // Platform
-#ifdef WNT
-#include <windows.h>
-#endif
+#include <svsys.h>
 
 #include <vcl/salgdi.hxx>
 
diff --git a/vcl/win/inc/svsys.h b/vcl/win/inc/svsys.h
index 9826886af7db..f7bc87b0c514 100644
--- a/vcl/win/inc/svsys.h
+++ b/vcl/win/inc/svsys.h
@@ -29,6 +29,11 @@
 #ifndef _SV_SVSYS_H
 #define _SV_SVSYS_H
 
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#endif
+
 #endif // _SV_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index a848cab2df0c..3d9834a86466 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include "rtl/tencinfo.h"
 #include <saldata.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 8362cdead7ad..7baa25fd5101 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -31,7 +31,7 @@
 
 #include <string.h>
 #ifdef WNT
-#include <windows.h>
+#include <svsys.h>
 #include <process.h>
 #endif
 #ifdef __MINGW32__
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 2e5d06be7de9..cdcf89d2224c 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include <saldata.hxx>
 #include <tools/debug.hxx>
 
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 81b36c97b4ed..536ca438e458 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 3b238816b172..959374699dbb 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <vcl/salbtype.hxx>
 #include <salgdi.h>
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 43beb67072c5..727c67298e89 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salgdi.h>
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 68e1b8df2742..c1ac7f7d60fa 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -31,7 +31,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <windows.h>
+#include <svsys.h>
 #include <tools/debug.hxx>
 #include <wincomp.hxx>
 #include <salbmp.h>
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 27f302f25491..f87cfaec386f 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -33,7 +33,7 @@
 #include <malloc.h>
 
 #include <vcl/sysdata.hxx>
-#include <windows.h>
+#include <svsys.h>
 
 #include "wincomp.hxx"
 #include "saldata.hxx"
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index e43d4db625e2..22c1b54559b6 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salgdi.h>
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 7931598d5a52..929fd8c8a644 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -32,7 +32,7 @@
 #define WINVER 0x0500
 
 #include <string.h>
-#include <windows.h>
+#include <svsys.h>
 
 #ifdef __MINGW32__
 #include <excpt.h>
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 2af02686b579..417c7e1f4952 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salinst.h>
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 8c9953b32b45..cd66f0f89cd8 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <windows.h>
+#include <svsys.h>
 
 #include "salgdi.h"
 #include "saldata.hxx"
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 9519099d0f53..2d4f3d279c3f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -47,7 +47,7 @@
 
 #include <stdio.h>
 
-#include <windows.h>
+#include <svsys.h>
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index e77fb07b7140..dcdf8fb7ae2a 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salinst.h>
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index 97b7ba92813e..c0965c298f63 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -31,7 +31,7 @@
 
 #include <string.h>
 
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salinst.h>