[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - common/Seccomp.cpp wsd/AdminModel.hpp

[Jan Holesovsky]

 common/Seccomp.cpp |    4 ++--
 wsd/AdminModel.hpp |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a1b40b10edb4555291c7313d85089a37c7b18920
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Aug 1 16:01:34 2017 +0200

    Fix two gerrit mis-merges.
    
    Change-Id: I03af522f6780ab9fd0f9daa3d004e5d69eb371fa

diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index 230559f5..e08b9ea8 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -12,13 +12,13 @@
  */
 
 #include "config.h"
-
-#if DISABLE_SECCOMP == 0
 #include <dlfcn.h>
 #include <ftw.h>
 #include <linux/audit.h>
 #include <linux/filter.h>
+#if DISABLE_SECCOMP == 0
 #include <linux/seccomp.h>
+#endif
 #include <malloc.h>
 #include <signal.h>
 #include <sys/capability.h>
diff --git a/wsd/AdminModel.hpp b/wsd/AdminModel.hpp
index 5a35bc8c..d20f6fcd 100644
--- a/wsd/AdminModel.hpp
+++ b/wsd/AdminModel.hpp
@@ -60,6 +60,7 @@ struct DocBasicInfo
           _saved(saved),
           _mem(mem)
         { }
+};
 
 struct DocProcSettings
 {