[Libreoffice-commits] online.git: 2 commits - common/Crypto.cpp common/Seccomp.cpp configure.ac tools/mount.cpp

[Pranav Kant]

 common/Crypto.cpp  |    2 +-
 common/Seccomp.cpp |    4 ++--
 configure.ac       |    2 +-
 tools/mount.cpp    |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 13534089999f00de61d5596ae5d917d545e48ba3
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Dec 21 16:14:49 2017 +0530

    loplugin:includeform
    
    Some files weren't rewritten from the last run.
    
    Change-Id: I8c5beadaf2cf9b367158abe6f0a5460fa3054521

diff --git a/common/Crypto.cpp b/common/Crypto.cpp
index 2c125a2f..46ba05c0 100644
--- a/common/Crypto.cpp
+++ b/common/Crypto.cpp
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "config.h"
+#include <config.h>
 
 #if ENABLE_SUPPORT_KEY
 
diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index e49c4d5e..e9389f05 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -11,7 +11,7 @@
  * exotic or un-necessary system calls to be used to break containment.
  */
 
-#include "config.h"
+#include <config.h>
 #include <dlfcn.h>
 #include <ftw.h>
 #include <linux/audit.h>
@@ -30,7 +30,7 @@
 
 #include <common/Log.hpp>
 #include <common/SigUtil.hpp>
-#include <Seccomp.hpp>
+#include "Seccomp.hpp"
 
 #ifndef SYS_SECCOMP
 #  define SYS_SECCOMP 1
diff --git a/tools/mount.cpp b/tools/mount.cpp
index 40c64eba..7afba1fc 100644
--- a/tools/mount.cpp
+++ b/tools/mount.cpp
@@ -10,11 +10,11 @@
  * This is a very tiny helper to allow overlay mounting.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <sys/mount.h>
 
-#include "security.h"
+#include <security.h>
 
 int main(int argc, char **argv)
 {
commit 000e8a352c7e3c137be2cf22dd56b57a38d6cd9d
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Dec 19 04:10:36 2017 +0530

    compilerplugins: pass absolute path to online dir
    
    This makes plugin.so in core.git to enter in LOOL mode.
    
    Change-Id: I99513b5a5b4e1ee2c26d16afa127b7a5da730ee3

diff --git a/configure.ac b/configure.ac
index 35a16c82..3172f12b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,7 +384,7 @@ done
 
 # need this after the other stuff that uses the compiler because we don't want to run configure-tests with the plugins enabled
 AS_IF([test -n "$with_compiler_plugins"],
-      [CPPFLAGS="$CPPFLAGS -Xclang -load -Xclang ${with_compiler_plugins}/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin"])
+      [CPPFLAGS="$CPPFLAGS -Xclang -load -Xclang ${with_compiler_plugins}/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin -Xclang -plugin-arg-loplugin -Xclang --lool-base-path=\${abs_top_srcdir}"])
 
 AC_DEFINE_UNQUOTED([LOOLWSD_CACHEDIR],["$LOOLWSD_CACHEDIR"],[Cache folder])
 AC_SUBST(LOOLWSD_CACHEDIR)