path-lookup: move NETWORK_DIRS to network-util.h

src/basic/path-lookup.h

@@ -70,8 +70,5 @@ void lookup_paths_done(LookupPaths *p);
 char **generator_binary_paths(RuntimeScope scope);
 char **env_generator_binary_paths(RuntimeScope scope);
 
-#define NETWORK_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/network"))
-#define NETWORK_DIRS_NULSTR CONF_PATHS_NULSTR("systemd/network")
-
 #define PORTABLE_PROFILE_DIRS CONF_PATHS_NULSTR("systemd/portable/profile")
 int find_portable_profile(const char *name, const char *unit, char **ret_path);

src/libsystemd/sd-network/network-util.h

@@ -4,8 +4,12 @@
 #include <errno.h>
 #include <stdbool.h>
 
+#include "constants.h"
 #include "macro.h"
 
+#define NETWORK_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/network"))
+#define NETWORK_DIRS_NULSTR CONF_PATHS_NULSTR("systemd/network")
+
 bool network_is_online(void);
 
 typedef enum AddressFamily {

src/libsystemd/sd-path/sd-path.c

@@ -7,6 +7,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "network-util.h"
 #include "nulstr-util.h"
 #include "path-lookup.h"
 #include "path-util.h"

src/network/netdev/netdev.c

@@ -29,6 +29,7 @@
 #include "netdevsim.h"
 #include "netif-util.h"
 #include "netlink-util.h"
+#include "network-util.h"
 #include "networkd-manager.h"
 #include "networkd-queue.h"
 #include "networkd-setlink.h"

src/network/networkctl-config-file.c

@@ -15,6 +15,7 @@
 #include "edit-util.h"
 #include "mkdir-label.h"
 #include "netlink-util.h"
+#include "network-util.h"
 #include "networkctl.h"
 #include "networkctl-config-file.h"
 #include "networkctl-util.h"

src/network/networkd-network.c

@@ -15,6 +15,7 @@
 #include "in-addr-util.h"
 #include "net-condition.h"
 #include "netdev/macvlan.h"
+#include "network-util.h"
 #include "networkd-address-label.h"
 #include "networkd-address.h"
 #include "networkd-bridge-fdb.h"

src/udev/net/link-config.c

@@ -27,6 +27,7 @@
 #include "netif-sriov.h"
 #include "netif-util.h"
 #include "netlink-util.h"
+#include "network-util.h"
 #include "parse-util.h"
 #include "path-lookup.h"
 #include "path-util.h"