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 7ea54b73a..40c2b7d62 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 85db78658..0cf91b599 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 ea5b4ec5c..3427809bd 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 015a48d1b..cbc72cd73 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 f62bfe26b..e05018baa 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 085a050ff..e80552c86 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 a9fa2a720..d05252587 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 9242443d3..b242f180c 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 de93646f4..dfb8061b1 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>