[Libreoffice-commits] online.git: common/SigUtil.cpp

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 15 11:00:25 UTC 2020


 common/SigUtil.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6f36a1b024cbf969e52849610ed658088d15330f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Jul 15 13:24:16 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jul 15 13:00:05 2020 +0200

    Fix iOS build: checkDumpGlobalState() is needed
    
    Change-Id: I5720a1dfb71ed0f1554038081bb1534a7af7f3e5
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98812
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
index f768005c6..905db3eaa 100644
--- a/common/SigUtil.cpp
+++ b/common/SigUtil.cpp
@@ -41,9 +41,11 @@
 static std::atomic<bool> TerminationFlag(false);
 static std::atomic<bool> DumpGlobalState(false);
 static std::atomic<bool> ShutdownRequestFlag(false);
+#endif
 
 namespace SigUtil
 {
+#ifndef IOS
     bool getShutdownRequestFlag()
     {
         return ShutdownRequestFlag;
@@ -65,6 +67,7 @@ namespace SigUtil
         TerminationFlag = false;
     }
 #endif
+#endif // !IOS
 
     void checkDumpGlobalState(GlobalDumpStateFn dumpState)
     {
@@ -380,6 +383,5 @@ namespace SigUtil
 #endif // !MOBILEAPP
 }
 
-#endif // !IOS
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list