You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/01/28 19:04:22 UTC
svn commit: r1727413 - in /openoffice/trunk/main/sal/qa: osl/file/
osl/module/ osl/mutex/ osl/process/ osl/security/ osl/socket/
rtl/bootstrap/ rtl/digest/ rtl/doublelock/ rtl/logfile/ rtl/uuid/
Author: damjan
Date: Thu Jan 28 18:04:22 2016
New Revision: 1727413
URL: http://svn.apache.org/viewvc?rev=1727413&view=rev
Log:
#i126787# fix unit tests on Windows
Fix a regression caused by r1710853 and which always existed in some files,
where <prewin.h> and <postwin.h> were being included before and after
<windows.h>, yet unavailable as the tools module isn't built (and can't be)
before sal.
Patch by: j.nitschke at ok.de
Review by: me
Modified:
openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h
openoffice/trunk/main/sal/qa/osl/module/osl_Module_Const.h
openoffice/trunk/main/sal/qa/osl/mutex/osl_Mutex.cxx
openoffice/trunk/main/sal/qa/osl/process/osl_process.cxx
openoffice/trunk/main/sal/qa/osl/process/osl_process_child.cxx
openoffice/trunk/main/sal/qa/osl/security/osl_Security_Const.h
openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const.h
openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const_orig.h
openoffice/trunk/main/sal/qa/osl/socket/sockethelper.hxx
openoffice/trunk/main/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
openoffice/trunk/main/sal/qa/rtl/digest/rtl_digest.cxx
openoffice/trunk/main/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx
openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx
Modified: openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h (original)
+++ openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h Thu Jan 28 18:04:22 2016
@@ -107,13 +107,10 @@ const sal_Char pBuffer_Blank[] = "";
# define PATH_SEPERATOR "/"
#endif
#if (defined WNT ) // Windows
-#include <tools/prewin.h>
-// # include <windows.h>
# include <tchar.h>
# include <io.h>
# include <stdio.h>
# include <stdlib.h>
-#include <tools/postwin.h>
# define PATH_MAX MAX_PATH
# define TEST_PLATFORM "c:/"
# define TEST_PLATFORM_ROOT "c:/"
Modified: openoffice/trunk/main/sal/qa/osl/module/osl_Module_Const.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/module/osl_Module_Const.h?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/module/osl_Module_Const.h (original)
+++ openoffice/trunk/main/sal/qa/osl/module/osl_Module_Const.h Thu Jan 28 18:04:22 2016
@@ -35,10 +35,7 @@
# include <unistd.h>
#endif
#if ( defined WNT ) // Windows
-#include <tools/prewin.h>
-// # include <windows.h>
# include <io.h>
-#include <tools/postwin.h>
#endif
# define FILE_PREFIX "file:///"
Modified: openoffice/trunk/main/sal/qa/osl/mutex/osl_Mutex.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/mutex/osl_Mutex.cxx?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/mutex/osl_Mutex.cxx (original)
+++ openoffice/trunk/main/sal/qa/osl/mutex/osl_Mutex.cxx Thu Jan 28 18:04:22 2016
@@ -31,10 +31,8 @@
#include <osl_Mutex_Const.h>
#ifdef WNT
-#include <tools/prewin.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#include <tools/postwin.h>
#endif
using namespace osl;
Modified: openoffice/trunk/main/sal/qa/osl/process/osl_process.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/process/osl_process.cxx?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/process/osl_process.cxx (original)
+++ openoffice/trunk/main/sal/qa/osl/process/osl_process.cxx Thu Jan 28 18:04:22 2016
@@ -36,12 +36,9 @@
#include <stdlib.h>
#include <osl/module.hxx>
-#if ( defined WNT ) // Windows
-#include <tools/prewin.h>
-# define WIN32_LEAN_AND_MEAN
-// # include <windows.h>
-# include <tchar.h>
-#include <tools/postwin.h>
+#ifdef WNT // Windows
+#define WIN32_LEAN_AND_MEAN
+#include <tchar.h>
#endif
#include <iostream>
Modified: openoffice/trunk/main/sal/qa/osl/process/osl_process_child.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/process/osl_process_child.cxx?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/process/osl_process_child.cxx (original)
+++ openoffice/trunk/main/sal/qa/osl/process/osl_process_child.cxx Thu Jan 28 18:04:22 2016
@@ -27,16 +27,13 @@
//########################################
// includes
-#if ( defined WNT ) // Windows
-#include <tools/prewin.h>
-# define UNICODE
-# define _UNICODE
-# define WIN32_LEAN_AND_MEAN
-// # include <windows.h>
-# include <tchar.h>
-#include <tools/postwin.h>
+#ifdef WNT // Windows
+#define UNICODE
+#define _UNICODE
+#define WIN32_LEAN_AND_MEAN
+#include <tchar.h>
#else
-# include <unistd.h>
+#include <unistd.h>
#endif
#include <stdio.h>
Modified: openoffice/trunk/main/sal/qa/osl/security/osl_Security_Const.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/security/osl_Security_Const.h?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/security/osl_Security_Const.h (original)
+++ openoffice/trunk/main/sal/qa/osl/security/osl_Security_Const.h Thu Jan 28 18:04:22 2016
@@ -28,11 +28,7 @@
#define _OSL_SECURITY_CONST_H_
#if ( defined WNT ) // Windows
-//#define UNICODE
-#include <tools/prewin.h>
-// #include <windows.h>
#include <io.h>
-#include <tools/postwin.h>
#endif
//------------------------------------------------------------------------
Modified: openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const.h?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const.h (original)
+++ openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const.h Thu Jan 28 18:04:22 2016
@@ -86,11 +86,8 @@ extern "C"
# include <arpa/inet.h>
#endif
#if ( defined WNT ) // Windows
-#include <tools/prewin.h>
-// # include <windows.h>
# include <winsock.h>
# include <string.h>
-#include <tools/postwin.h>
#endif
Modified: openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const_orig.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const_orig.h?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const_orig.h (original)
+++ openoffice/trunk/main/sal/qa/osl/socket/osl_Socket_Const_orig.h Thu Jan 28 18:04:22 2016
@@ -86,11 +86,8 @@ extern "C"
# include <arpa/inet.h>
#endif
#if ( defined WNT ) // Windows
-#include <tools/prewin.h>
-// # include <windows.h>
# include <winsock.h>
# include <string.h>
-#include <tools/postwin.h>
#endif
Modified: openoffice/trunk/main/sal/qa/osl/socket/sockethelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/socket/sockethelper.hxx?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/socket/sockethelper.hxx (original)
+++ openoffice/trunk/main/sal/qa/osl/socket/sockethelper.hxx Thu Jan 28 18:04:22 2016
@@ -83,11 +83,8 @@ extern "C"
#ifndef _OSL_SOCKET_CONST_H_
#if ( defined WNT ) // Windows
-#include <tools/prewin.h>
-// #include <windows.h>
#include <winsock.h>
#include <string.h>
-#include <tools/postwin.h>
#endif
#endif
Modified: openoffice/trunk/main/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx (original)
+++ openoffice/trunk/main/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx Thu Jan 28 18:04:22 2016
@@ -34,9 +34,7 @@
#ifdef WNT
#define WIN32_LEAN_AND_MEAN
-#include <tools/prewin.h>
#include <windows.h>
-#include <tools/postwin.h>
#endif
#include "gtest/gtest.h"
Modified: openoffice/trunk/main/sal/qa/rtl/digest/rtl_digest.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/digest/rtl_digest.cxx?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/rtl/digest/rtl_digest.cxx (original)
+++ openoffice/trunk/main/sal/qa/rtl/digest/rtl_digest.cxx Thu Jan 28 18:04:22 2016
@@ -39,7 +39,7 @@ rtl::OUString CreateMD5FromString( const
// BACK: Str "ababab....0f" Hexcode String
rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
- if ( handle > 0 )
+ if ( handle != NULL )
{
const sal_uInt8* pData = (const sal_uInt8*)aMsg.getStr();
sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode ));
Modified: openoffice/trunk/main/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/doublelock/rtl_doublelocking.cxx?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/rtl/doublelock/rtl_doublelocking.cxx (original)
+++ openoffice/trunk/main/sal/qa/rtl/doublelock/rtl_doublelocking.cxx Thu Jan 28 18:04:22 2016
@@ -42,9 +42,7 @@
#ifdef WNT
#define WIN32_LEAN_AND_MEAN
-#include <tools/prewin.h>
#include <windows.h>
-#include <tools/postwin.h>
#endif
// -----------------------------------------------------------------------------
Modified: openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx (original)
+++ openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx Thu Jan 28 18:04:22 2016
@@ -46,12 +46,7 @@
// #endif
#include <osl/file.hxx>
#if ( defined WNT ) // Windows
-#include <tools/prewin.h>
-// #define UNICODE
-// #define WIN32_LEAN_AND_MEAN
-// #include <windows.h>
#include <tchar.h>
-#include <tools/postwin.h>
#endif
using namespace ::osl;
Modified: openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx?rev=1727413&r1=1727412&r2=1727413&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx (original)
+++ openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx Thu Jan 28 18:04:22 2016
@@ -33,9 +33,7 @@
#ifdef WNT
#define WIN32_LEAN_AND_MEAN
-#include <tools/prewin.h>
#include <windows.h>
-#include <tools/postwin.h>
#endif
#ifdef UNX