diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-10-29 22:04:19 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-10-30 00:20:59 +0200 |
| commit | 629f9ff63bf3a1e16ed38a737a7fdd074b9c0ca7 (patch) | |
| tree | 54ab3879da772ce5cba2ff41af2c8bb66a895fc5 /vcl | |
| parent | 87f57f3aaf90706f1b3e0a9bc22de17378f319f2 (diff) | |
m_FeedbackFDs is unused on iOS
I wonder why we have that iOS ifdef in SvpSalInstance::Wakeup()?
Elsewhere in this file we do compile code that uses those same fields
for iOS, too.
Change-Id: Ib801ea81fafcf2296181874018c1df2ceef144a1
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/headless/svpinst.cxx | 2 | ||||
| -rw-r--r-- | vcl/inc/headless/svpinst.hxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index a711d693f00e..25e15ca9961a 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -298,7 +298,9 @@ 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 7c2b5efce593..4793d8e463d5 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -73,7 +73,9 @@ 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 |