diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-09-20 15:03:12 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-09-20 14:08:54 +0200 |
| commit | 1725eda0be7546702007c8627e907a95924a50e4 (patch) | |
| tree | cab260a332384ee5a35d7765239f3f741735fb24 | |
| parent | tdf#125397: Avoid crash if GetpApp() returns null, can happen on iOS at least (diff) | |
| download | core-1725eda0be7546702007c8627e907a95924a50e4.tar.gz core-1725eda0be7546702007c8627e907a95924a50e4.zip | |
Revert "m_FeedbackFDs is unused on iOS"
It is not unused now any longer. However it is unclear whether it
actually is needed or not. I was able to build and run the iOS app
even while it was unused.
This reverts commit 629f9ff63bf3a1e16ed38a737a7fdd074b9c0ca7.
Change-Id: I7c1d1abb6dae5f0739b112883149ea83ca4fb975
Reviewed-on: https://gerrit.libreoffice.org/79285
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | vcl/headless/svpinst.cxx | 2 | ||||
| -rw-r--r-- | vcl/inc/headless/svpinst.hxx | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index b3b082af98b3..22ec77ec8c7f 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -295,9 +295,7 @@ void SvpSalInstance::ProcessEvent( SalUserEvent aEvent ) SvpSalYieldMutex::SvpSalYieldMutex() { -#ifndef IOS m_FeedbackFDs[0] = m_FeedbackFDs[1] = -1; -#endif } SvpSalYieldMutex::~SvpSalYieldMutex() diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index a57f57234a50..2c3d21cde8e8 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -73,9 +73,7 @@ private: // at least one subclass of SvpSalInstance (GTK3) that doesn't use them. friend class SvpSalInstance; // members for communication from main thread to non-main thread -#ifndef IOS int m_FeedbackFDs[2]; -#endif osl::Condition m_NonMainWaitingYieldCond; // members for communication from non-main thread to main thread bool m_bNoYieldLock = false; // accessed only on main thread |