[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - common/Seccomp.cpp

Rene Engelhard rene at debian.org
Sat Mar 3 11:07:53 UTC 2018


 common/Seccomp.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f20fea1d9ab207697d0a3cf356aa56e750298363
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Mar 3 01:23:52 2018 +0100

    fix --disable-seccomp build
    
    Change-Id: I32008de7745e106e4a633fb587f2837c59cdd541
    Reviewed-on: https://gerrit.libreoffice.org/50652
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit abf489991fc24bdaf51398884180fe08df1a5e0a)
    Reviewed-on: https://gerrit.libreoffice.org/50664

diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index e49c4d5e8..20d12498c 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -32,6 +32,7 @@
 #include <common/SigUtil.hpp>
 #include <Seccomp.hpp>
 
+#if DISABLE_SECCOMP == 0
 #ifndef SYS_SECCOMP
 #  define SYS_SECCOMP 1
 #endif
@@ -43,7 +44,6 @@
 #  error "Platform does not support seccomp filtering yet - unsafe."
 #endif
 
-#if DISABLE_SECCOMP == 0
 extern "C" {
 
 static void handleSysSignal(int /* signal */,


More information about the Libreoffice-commits mailing list