From 8f328d36c9c66efdb40fd19a970523d715078826 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 27 Oct 2015 01:03:03 +0100 Subject: socket-util: move CMSG_FOREACH() from macro.h to socket-util.h --- src/basic/fd-util.c | 3 ++- src/basic/macro.h | 3 --- src/basic/socket-util.h | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/basic') diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c index f40365ce97..830522cdb5 100644 --- a/src/basic/fd-util.c +++ b/src/basic/fd-util.c @@ -19,10 +19,11 @@ along with systemd; If not, see . ***/ +#include "dirent-util.h" #include "fd-util.h" #include "parse-util.h" +#include "socket-util.h" #include "util.h" -#include "dirent-util.h" int close_nointr(int fd) { assert(fd >= 0); diff --git a/src/basic/macro.h b/src/basic/macro.h index c9bbe8df4b..02f34cedad 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -427,7 +427,4 @@ do { \ } \ struct __useless_struct_to_allow_trailing_semicolon__ -#define CMSG_FOREACH(cmsg, mh) \ - for ((cmsg) = CMSG_FIRSTHDR(mh); (cmsg); (cmsg) = CMSG_NXTHDR((mh), (cmsg))) - #include "log.h" diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h index 8b5410b391..c60f2556af 100644 --- a/src/basic/socket-util.h +++ b/src/basic/socket-util.h @@ -127,3 +127,6 @@ int getpeersec(int fd, char **ret); int send_one_fd(int transport_fd, int fd, int flags); int receive_one_fd(int transport_fd, int flags); + +#define CMSG_FOREACH(cmsg, mh) \ + for ((cmsg) = CMSG_FIRSTHDR(mh); (cmsg); (cmsg) = CMSG_NXTHDR((mh), (cmsg))) -- cgit v1.2.3-54-g00ecf