[Libreoffice-commits] .: sal/qa

Tor Lillqvist tml at kemper.freedesktop.org
Tue Feb 8 15:06:57 PST 2011


 sal/qa/osl/module/osl_Module_Const.h      |    1 -
 sal/qa/osl/process/osl_process.cxx        |    2 --
 sal/qa/osl/socket/osl_Socket_Const.h      |    1 -
 sal/qa/osl/socket/osl_Socket_Const_orig.h |    1 -
 4 files changed, 5 deletions(-)

New commits:
commit 7270e0881317a4e2468a76193011254466c3662b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Feb 9 00:58:22 2011 +0200

    prewin.h already includes <windows.h>

diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index 1b6ce97..85db786 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -44,7 +44,6 @@
 #endif
 #if ( defined WNT )                     // Windows
 #include <prewin.h>
-// #	include <windows.h>
 #	include <io.h>
 #include <postwin.h>
 #endif
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index cd1c308..fd3eed3 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -44,8 +44,6 @@
 
 #if ( defined WNT )                     // Windows
 #include <prewin.h>
-#	define WIN32_LEAN_AND_MEAN
-// #	include <windows.h>
 #   include <tchar.h>
 #include <postwin.h>
 #endif
diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h
index 5f707f4..085a050 100644
--- a/sal/qa/osl/socket/osl_Socket_Const.h
+++ b/sal/qa/osl/socket/osl_Socket_Const.h
@@ -82,7 +82,6 @@ extern "C"
 #endif
 #if ( defined WNT )                     // Windows
 #include <prewin.h>
-// #	include <windows.h> 
 #	include <winsock.h> 
 #	include <string.h>
 #include <postwin.h>
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index bef7f42..a9fa2a7 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -82,7 +82,6 @@ extern "C"
 #endif
 #if ( defined WNT )                     // Windows
 #include <prewin.h>
-// #	include <windows.h> 
 #	include <winsock.h> 
 #	include <string.h>
 #include <postwin.h>


More information about the Libreoffice-commits mailing list