From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 27 Oct 2015 00:03:03 +0000 (+0100)
Subject: socket-util: move CMSG_FOREACH() from macro.h to socket-util.h
X-Git-Tag: v228~140^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f328d36c9c66efdb40fd19a970523d715078826;p=thirdparty%2Fsystemd.git

socket-util: move CMSG_FOREACH() from macro.h to socket-util.h
---

diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index f40365ce970..830522cdb5a 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 c9bbe8df4bf..02f34cedadc 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 8b5410b3910..c60f2556af8 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 64346a78220..60fc3179b0b 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"