network: move NETWORK_DIRS to path-lookup.h

In preparation for future changes...

diff --git a/src/basic/path-lookup.h b/src/basic/path-lookup.h
index 52f7a570a298048a1804e5628de30bcb27bcec18..f67b8d416a1e334599fcde3e3a96922d77d338e4 100644 (file)
--- a/src/basic/path-lookup.h
+++ b/src/basic/path-lookup.h
@@ -5,6 +5,7 @@
 
 typedef struct LookupPaths LookupPaths;
 
+#include "def.h"
 #include "unit-file.h"
 #include "macro.h"
 
@@ -68,3 +69,5 @@ void lookup_paths_free(LookupPaths *p);
 
 char **generator_binary_paths(UnitFileScope scope);
 char **env_generator_binary_paths(bool is_system);
+
+#define NETWORK_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/network"))

diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
index 593bad223068647abd5320ffcff41475227b88bc..16ff173ac6647cd1c491c0233f3423722520554e 100644 (file)
--- a/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@ -8,7 +8,6 @@
 #include "sd-dhcp-lease.h"
 
 #include "conf-parser.h"
-#include "def.h"
 #include "set.h"
 #include "strv.h"
 
@@ -66,5 +65,3 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, size_t
 
 /* It is not necessary to add deserialize_dhcp_option(). Use unhexmem() instead. */
 int serialize_dhcp_option(FILE *f, const char *key, const void *data, size_t size);
-
-#define NETWORK_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/network"))

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index f8121a48ed92932efd6f5643afe431461b313d92..bc85d4babb734a411beae9aa62c085ba2dd1e287 100644 (file)
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -24,6 +24,7 @@
 #include "network-internal.h"
 #include "networkd-manager.h"
 #include "nlmon.h"
+#include "path-lookup.h"
 #include "siphash24.h"
 #include "stat-util.h"
 #include "string-table.h"

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 804f33d6cb4896c21247a79d982e3816cfb89fee..0872b7301b5e7d364688368ee47d40506846fd56 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -30,6 +30,7 @@
 #include "networkd-network-bus.h"
 #include "networkd-speed-meter.h"
 #include "ordered-set.h"
+#include "path-lookup.h"
 #include "path-util.h"
 #include "set.h"
 #include "signal-util.h"

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index e7ead446c7640227874263790168a09adfa426f6..0007f78ae3fd739d4cfd0236c5f37a90b962aa85 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -16,6 +16,7 @@
 #include "networkd-manager.h"
 #include "networkd-network.h"
 #include "parse-util.h"
+#include "path-lookup.h"
 #include "set.h"
 #include "socket-util.h"
 #include "stat-util.h"

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 9c82759818a2875bfb4b24b333da7d072aa09847..71946c9ecc75e50c5d9821d68071ab2fdb5ed043 100644 (file)
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -20,6 +20,7 @@
 #include "netlink-util.h"
 #include "network-internal.h"
 #include "parse-util.h"
+#include "path-lookup.h"
 #include "path-util.h"
 #include "proc-cmdline.h"
 #include "random-util.h"