[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - kit/Kit.cpp

[Tor Lillqvist]

 kit/Kit.cpp |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 84b7b48780e72e279aafc9150e1b7e7e60acb02d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 26 11:53:35 2017 +0300

    Fix makedev warning
    
    g++ says: In the GNU C Library, "makedev" is defined by
    <sys/sysmacros.h>. For historical compatibility, it is currently
    defined by <sys/types.h> as well, but we plan to remove this soon. To
    use "makedev", include <sys/sysmacros.h> directly. If you did not
    intend to use a system-defined macro "makedev", you should undefine it
    after including <sys/types.h>.
    
    Change-Id: If5cd1ec0ca34b00b1248e9b2650d4d13e6d3bf64
    (cherry picked from commit a806655e59786b9de6d64dfcff30bfa4fde6af67)
    Reviewed-on: https://gerrit.libreoffice.org/48627
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 304a62e5..bb10f534 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -19,6 +19,7 @@
 #include <sys/capability.h>
 #include <unistd.h>
 #include <utime.h>
+#include <sys/sysmacros.h>
 
 #include <atomic>
 #include <cassert>