summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-27 01:03:03 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-27 13:25:57 +0100
commit8f328d36c9c66efdb40fd19a970523d715078826 (patch)
tree9db8fb9b093f81f078caa7f6a01c4e43359b077a /src
parentafc5dbf37fd2399d37976388d9dd9ab470ecf446 (diff)
downloadsystemd-8f328d36c9c66efdb40fd19a970523d715078826.tar.gz
socket-util: move CMSG_FOREACH() from macro.h to socket-util.h
Diffstat (limited to 'src')
-rw-r--r--src/basic/fd-util.c3
-rw-r--r--src/basic/macro.h3
-rw-r--r--src/basic/socket-util.h3
-rw-r--r--src/udev/udevd.c1
4 files changed, 6 insertions, 4 deletions
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 <http://www.gnu.org/licenses/>.
***/
+#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)))
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 64346a7822..60fc3179b0 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -59,6 +59,7 @@
#include "process-util.h"
#include "selinux-util.h"
#include "signal-util.h"
+#include "socket-util.h"
#include "string-util.h"
#include "terminal-util.h"
#include "udev-util.h"