diff options
author | Tor Lillqvist <tml@collabora.com> | 2016-04-22 20:09:39 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2016-04-22 20:09:39 +0300 |
commit | d95a98b06c9c94de3cf43f28ad3fde95425c24f7 (patch) | |
tree | 1553f98bdbb30fe6137f5d9bf37e0e3b65dab24a /vcl/headless | |
parent | fdc1bd89559ea5efe2b3f6aa45b5158fedaed587 (diff) |
Blind fix for Android build
Change-Id: Ifdcdc50bab452408d1c50530095c6fbf77aa600f
Diffstat (limited to 'vcl/headless')
-rw-r--r-- | vcl/headless/svpinst.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 82c18950f6c6..5cbcf4a98fde 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -18,6 +18,7 @@ */ #include <unistd.h> +#include <errno.h> #include <fcntl.h> #include <pthread.h> #include <sys/time.h> @@ -60,6 +61,8 @@ bool SvpSalInstance::isFrameAlive( const SalFrame* pFrame ) const SvpSalInstance* SvpSalInstance::s_pDefaultInstance = nullptr; +#ifndef ANDROID + static void atfork_child() { if (SvpSalInstance::s_pDefaultInstance != nullptr) @@ -69,6 +72,8 @@ static void atfork_child() } } +#endif + SvpSalInstance::SvpSalInstance( SalYieldMutex *pMutex ) : SalGenericInstance( pMutex ) { @@ -80,7 +85,9 @@ SvpSalInstance::SvpSalInstance( SalYieldMutex *pMutex ) : CreateWakeupPipe(); if( s_pDefaultInstance == nullptr ) s_pDefaultInstance = this; +#ifndef ANDROID pthread_atfork(nullptr, nullptr, atfork_child); +#endif } SvpSalInstance::~SvpSalInstance() |