[Libreoffice-commits] online.git: common/Log.hpp common/Seccomp.cpp common/Util.cpp

[Libreoffice Gerrit user]

 common/Log.hpp     |    3 +--
 common/Seccomp.cpp |    1 +
 common/Util.cpp    |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 57326ae27cd9eb4a9a69b075395784836bbc9f99
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Aug 29 18:32:48 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Aug 29 18:36:16 2018 +0300

    Third parameter to prefix() is a bool
    
    Passing syscall(SYS_gettid) as a bool is equivalent to passing true,
    as far as I understand.
    
    Change-Id: I31bb15000a9e6c95b657d58bc78df4f3da0fe687

diff --git a/common/Log.hpp b/common/Log.hpp
index 0ae6a2a7e..cc60e4148 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_LOG_HPP
 #define INCLUDED_LOG_HPP
 
-#include <sys/syscall.h>
 #include <unistd.h>
 
 #include <functional>
@@ -83,7 +82,7 @@ namespace Log
             _enabled(true)
         {
             char buffer[1024];
-            _stream << prefix(buffer, level, syscall(SYS_gettid));
+            _stream << prefix(buffer, level, true);
         }
 
         StreamLogger(StreamLogger&& sl) noexcept
diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index 3f363923a..2c77f35ed 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -24,6 +24,7 @@
 #include <sys/capability.h>
 #include <sys/prctl.h>
 #include <sys/resource.h>
+#include <sys/syscall.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <utime.h>
diff --git a/common/Util.cpp b/common/Util.cpp
index a03cf4c46..e14412329 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -18,6 +18,7 @@
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <sys/vfs.h>
+#include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <dirent.h>