diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-24 11:42:02 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-24 12:30:32 +0200 |
| commit | b3c8859cd20bd02adea5d2b026001f67feacc754 (patch) | |
| tree | b92b9e5823f63a6e16bb0c4a7d1e08216b2873e4 /sal | |
| parent | f2b6f4f00a4a96a8eb0d7a40aa7a01eea8e21cd0 (diff) | |
Revert "Try to blind-solve cppunittester hangs on Windows"
This reverts commit 1126515226b60630b3a0fd72c45258b230dfe8fd.
Reason for revert: it only took one run after merging the patch to see it
still hangs...
Change-Id: I9235004d0568462b112da7f23bc615f3647f4755
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94677
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/Executable_cppunittester.mk | 4 | ||||
| -rw-r--r-- | sal/cppunittester/cppunittester.cxx | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index 65426e722240..3b9016783b80 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -28,10 +28,6 @@ $(eval $(call gb_Executable_add_exception_objects,cppunittester,\ sal/cppunittester/cppunittester \ )) -$(eval $(call gb_Executable_use_system_win32_libs,cppunittester,\ - ole32 \ -)) - ifeq ($(COM),MSC) $(eval $(call gb_Executable_add_ldflags,cppunittester,\ diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 1b3c518c4b21..a760ecf8ff41 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -18,9 +18,10 @@ */ #ifdef _WIN32 -#include <prewin.h> -#include <ole2.h> -#include <postwin.h> +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif +#include <windows.h> #endif #ifdef UNX @@ -388,9 +389,6 @@ SAL_IMPLEMENT_MAIN() _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG|_CRTDBG_MODE_FILE); _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); #endif - - // Tests may use e.g. OLE or clipboard; initialize COM and appropriate concurrency early - OleInitialize(nullptr); #endif std::vector<CppUnit::Protector *> protectors; |