[systemd-commits] src/libsystemd src/shared

[Daniel Mack]

 src/libsystemd/sd-bus/bus-message.h |    1 +
 src/shared/util.h                   |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 2c35d880de01c3f37b49b138455ed2c3641e34ca
Author: Daniel Mack <daniel at zonque.org>
Date:   Tue Feb 24 00:42:13 2015 +0100

    sd-bus, shared: fix includes
    
    Include <sys/socket.h> from util.h and bus-message.h in order to
    build errors like the ones below on kdbus enabled systems.
    
    ./src/shared/util.h:976:32: warning: its scope is only this definition or declaration, which is probably not what you want
    In file included from src/libsystemd/sd-bus/bus-kernel.c:37:0:
    ./src/shared/util.h:1081:28: warning: 'struct msghdr' declared inside parameter list
     void cmsg_close_all(struct msghdr *mh);
                                ^
      CC       src/libsystemd/sd-bus/libsystemd_la-bus-creds.lo
    In file included from src/libsystemd/sd-bus/bus-creds.c:25:0:
    ./src/shared/util.h:976:32: warning: 'struct ucred' declared inside parameter list
     int getpeercred(int fd, struct ucred *ucred);
                                    ^

diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index a68dee4..d784e60 100644
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -23,6 +23,7 @@
 
 #include <stdbool.h>
 #include <byteswap.h>
+#include <sys/socket.h>
 
 #include "macro.h"
 #include "sd-bus.h"
diff --git a/src/shared/util.h b/src/shared/util.h
index a923553..2de654f 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -33,6 +33,7 @@
 #include <sched.h>
 #include <limits.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <stddef.h>