[Libreoffice-commits] core.git: vcl/headless

Tor Lillqvist tml at collabora.com
Fri Apr 22 17:10:19 UTC 2016


 vcl/headless/svpinst.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit d95a98b06c9c94de3cf43f28ad3fde95425c24f7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 22 20:09:39 2016 +0300

    Blind fix for Android build
    
    Change-Id: Ifdcdc50bab452408d1c50530095c6fbf77aa600f

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 82c1895..5cbcf4a 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()


More information about the Libreoffice-commits mailing list