Wholesale prewin.h/postwin.h removal

9 files changed, 1 insertions, 19 deletions

diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 6231e3bddd2e..2e423b1622d7 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -105,12 +105,10 @@ const sal_Char pBuffer_Blank[]  = "";
 #endif
 
 #if (defined WNT )                      // Windows
-#   include <prewin.h>
 #       include <tchar.h>
 #       include <io.h>
 #       include <stdio.h>
 #       include <stdlib.h>
-#   include <postwin.h>
 #   define PATH_MAX             MAX_PATH
 #   define TEST_PLATFORM        "c:/"
 #   define TEST_PLATFORM_ROOT   "c:/"
diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index 56944fb27bd1..629d201f908e 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -43,9 +43,7 @@
 #   include <unistd.h>
 #endif
 #if ( defined WNT )                     // Windows
-#include <prewin.h>
 #   include <io.h>
-#include <postwin.h>
 #endif
 
 #   define FILE_PREFIX          "file:///"
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index c574f23a9de3..1980e972fb50 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -48,9 +48,7 @@
 #include <sal/macros.h>
 
 #if ( defined WNT )                     // Windows
-#include <prewin.h>
 #   include <tchar.h>
-#include <postwin.h>
 #endif
 
 #include "rtl/allocator.hxx"
diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx
index 066803edd801..91addf9c1659 100644
--- a/sal/qa/osl/process/osl_process_child.cxx
+++ b/sal/qa/osl/process/osl_process_child.cxx
@@ -33,13 +33,11 @@
 // includes
 
 #if ( defined WNT )                     // Windows
-#include <prewin.h>
 #   define UNICODE
 #   define _UNICODE
 #   define WIN32_LEAN_AND_MEAN
-// #    include <windows.h>
+#   include <windows.h>
 #   include <tchar.h>
-#include <postwin.h>
 #else
 #   include <unistd.h>
 #endif
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index f62bfe26bd8b..e05018baa50d 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -30,9 +30,7 @@
 #define _OSL_SECURITY_CONST_H_
 
 #if ( defined WNT )                     // Windows
-#include <prewin.h>
 #include <io.h>
-#include <postwin.h>
 #endif
 
 #include <sal/types.h>
diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h
index c95232d73f0c..0aff414a34a0 100644
--- a/sal/qa/osl/socket/osl_Socket_Const.h
+++ b/sal/qa/osl/socket/osl_Socket_Const.h
@@ -81,10 +81,8 @@ extern "C"
 #       include <arpa/inet.h>
 #endif
 #if ( defined WNT )                     // Windows
-#include <prewin.h>
 #   include <winsock.h>
 #   include <string.h>
-#include <postwin.h>
 #endif
 
 
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index 308a9416633c..76fb491459ec 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -81,10 +81,8 @@ extern "C"
 #       include <arpa/inet.h>
 #endif
 #if ( defined WNT )                     // Windows
-#include <prewin.h>
 #   include <winsock.h>
 #   include <string.h>
-#include <postwin.h>
 #endif
 
 
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index 84be1a5c330b..c0f6e85ad3ec 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -74,10 +74,8 @@ extern "C"
 #ifndef _OSL_SOCKET_CONST_H_
 
 #if ( defined WNT )                     // Windows
-#include <prewin.h>
 #include <winsock.h>
 #include <string.h>
-#include <postwin.h>
 #endif
 
 #endif
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index 4d82eda190f5..816e4da21e70 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -45,9 +45,7 @@
 
 #include <osl/file.hxx>
 #if ( defined WNT )                     // Windows
-#include <prewin.h>
 #include <tchar.h>
-#include <postwin.h>
 #endif
 
 #include <cppunit/TestFixture.h>