From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 24 Mar 2020 16:02:11 +0000 (+0100)
Subject: network: move NETWORK_DIRS to path-lookup.h
X-Git-Tag: v246-rc1~685^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0c82192604c2e21e7d1beab23855111a8213b60;p=thirdparty%2Fsystemd.git

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 52f7a570a29..f67b8d416a1 100644
--- 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 593bad22306..16ff173ac66 100644
--- 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 f8121a48ed9..bc85d4babb7 100644
--- 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 804f33d6cb4..0872b7301b5 100644
--- 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 e7ead446c76..0007f78ae3f 100644
--- 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 9c82759818a..71946c9ecc7 100644
--- 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"