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 f40365ce97032c7f92752d97ba52dbc626e22f30..830522cdb5a30bdd1435749172bad1efc2a43b85 100644 (file)
--- 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 c9bbe8df4bf36fdfadeb85b797ba1be643fcab4b..02f34cedadc2bb1248025b72c8f3b7ffeb79fc60 100644 (file)
--- 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 8b5410b39103d5f048111af4361afbdb4903ee21..c60f2556af840e86806adbea785ce7a86a30d239 100644 (file)
--- 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 64346a782200353cd4e07059ff321d8dc767e7b3..60fc3179b0badbd901ad314ab1a88c9f8d11a29c 100644 (file)
--- 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"