[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/qa
Damjan Jovanovic
damjan at apache.org
Thu Jan 28 10:10:27 PST 2016
sal/qa/osl/file/osl_File_Const.h | 3 ---
sal/qa/osl/module/osl_Module_Const.h | 3 ---
sal/qa/osl/mutex/osl_Mutex.cxx | 2 --
sal/qa/osl/process/osl_process.cxx | 9 +++------
sal/qa/osl/process/osl_process_child.cxx | 15 ++++++---------
sal/qa/osl/security/osl_Security_Const.h | 4 ----
sal/qa/osl/socket/osl_Socket_Const.h | 3 ---
sal/qa/osl/socket/osl_Socket_Const_orig.h | 3 ---
sal/qa/osl/socket/sockethelper.hxx | 3 ---
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 2 --
sal/qa/rtl/digest/rtl_digest.cxx | 2 +-
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 2 --
sal/qa/rtl/logfile/rtl_logfile.cxx | 5 -----
sal/qa/rtl/uuid/rtl_Uuid.cxx | 2 --
14 files changed, 10 insertions(+), 48 deletions(-)
New commits:
commit 729d1c1df8068f36cc44c0e6a12241338ebf774e
Author: Damjan Jovanovic <damjan at apache.org>
Date: Thu Jan 28 18:04:22 2016 +0000
#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
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 0e839d6..2bb52a5 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -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:/"
diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index 3eb90e7..8071a69 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -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:///"
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 55ed5cc..b187494 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -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;
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 0c1ee9f..e0b3f44 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -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>
diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx
index 57e6be2..dfe7614 100644
--- a/sal/qa/osl/process/osl_process_child.cxx
+++ b/sal/qa/osl/process/osl_process_child.cxx
@@ -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>
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index f68839d..c1909d0 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -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
//------------------------------------------------------------------------
diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h
index 63aa45a..3696cb4 100644
--- a/sal/qa/osl/socket/osl_Socket_Const.h
+++ b/sal/qa/osl/socket/osl_Socket_Const.h
@@ -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
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index 5f8e367..cbaa9d7 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -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
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index d1ef150..1a66a51 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -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
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index 19e88ce..82e9154 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -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"
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 89e53df..ec7aebe 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -39,7 +39,7 @@ rtl::OUString CreateMD5FromString( const rtl::OUString& aMsg )
// 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 ));
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 80987b0..bd168b4 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -42,9 +42,7 @@
#ifdef WNT
#define WIN32_LEAN_AND_MEAN
-#include <tools/prewin.h>
#include <windows.h>
-#include <tools/postwin.h>
#endif
// -----------------------------------------------------------------------------
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index eee2977..153cb5e 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -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;
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index ca0abfb..9d876d6 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -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
More information about the Libreoffice-commits
mailing list