From 2667435ea5e6b73e58e57703b6fc3896e87eb370 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sat, 18 Mar 2017 19:58:53 +1100 Subject: vcl: have AcquaSalInstance use osl::Condition instead of oslCondition Condition is deprecated already, but there is no need for the AcquaSalInstance class to use the low-level C-API, when in fact there is a C++ fascade that calls on this via the C++ abstraction, osl::Condition. This will make it much easier to switch to using std::condition_variable in the future. Change-Id: Ic495c4120a59480bf50a8c5b73608874fc4228ea Reviewed-on: https://gerrit.libreoffice.org/35392 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- include/osl/conditn.hxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/osl') diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx index bc96e2f4d0f5..07d697948077 100644 --- a/include/osl/conditn.hxx +++ b/include/osl/conditn.hxx @@ -28,6 +28,11 @@ #include +#if defined(MACOSX) && defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES) +# if __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES == 1 +# undef check +# endif +#endif namespace osl { -- cgit