[Libreoffice-commits] .: sal/qa

[Fridrich Strba]

 sal/qa/osl/file/osl_File_Const.h          |    2 --
 sal/qa/osl/module/osl_Module_Const.h      |    2 --
 sal/qa/osl/process/osl_process.cxx        |    2 --
 sal/qa/osl/process/osl_process_child.cxx  |    4 +---
 sal/qa/osl/security/osl_Security_Const.h  |    2 --
 sal/qa/osl/socket/osl_Socket_Const.h      |    2 --
 sal/qa/osl/socket/osl_Socket_Const_orig.h |    2 --
 sal/qa/osl/socket/sockethelper.hxx        |    2 --
 sal/qa/rtl/logfile/rtl_logfile.cxx        |    2 --
 9 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit b09106f009cd386943411be62cf7cc3123389e32
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 25 19:06:30 2011 +0100

    Wholesale prewin.h/postwin.h removal

diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 7ea54b7..40c2b7d 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 85db786..0cf91b5 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 ea5b4ec..3427809 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 015a48d..cbc72cd 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 f62bfe2..e05018b 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 085a050..e80552c 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 a9fa2a7..d052525 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 9242443..b242f18 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 de93646..dfb8061 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>