From 81833358786b0fdd0668ef92b0bdc1361fa980b3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 15 Apr 2019 09:23:31 +0200 Subject: [PATCH] shared: move "nm-dbus-compat.h" header to "nm-std-aux/nm-dbus-compat.h" --- Makefile.am | 2 +- libnm/nm-dbus-helpers.h | 2 +- shared/{ => nm-std-aux}/nm-dbus-compat.h | 0 shared/nm-test-utils-impl.c | 2 +- src/devices/bluetooth/nm-bluez-manager.c | 2 +- src/devices/team/nm-device-team.c | 2 +- src/devices/wifi/nm-device-iwd.c | 2 +- src/devices/wwan/nm-modem-manager.c | 2 +- src/dns/nm-dns-systemd-resolved.c | 2 +- src/nm-dbus-manager.c | 2 +- src/nm-manager.c | 2 +- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 2 +- src/supplicant/nm-supplicant-interface.c | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename shared/{ => nm-std-aux}/nm-dbus-compat.h (100%) diff --git a/Makefile.am b/Makefile.am index a2e768a3c2..7a2155236a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -302,6 +302,7 @@ shared_nm_std_aux_libnm_std_aux_la_SOURCES = \ shared/c-list/src/c-list.h \ shared/nm-std-aux/c-list-util.c \ shared/nm-std-aux/c-list-util.h \ + shared/nm-std-aux/nm-dbus-compat.h \ shared/nm-std-aux/unaligned.h \ $(NULL) @@ -4604,7 +4605,6 @@ EXTRA_DIST += \ po/meson.build \ \ shared/nm-common-macros.h \ - shared/nm-dbus-compat.h \ shared/nm-default.h \ shared/nm-dispatcher-api.h \ shared/nm-test-libnm-utils.h \ diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h index 0f2cabe8cf..eb5394f032 100644 --- a/libnm/nm-dbus-helpers.h +++ b/libnm/nm-dbus-helpers.h @@ -25,7 +25,7 @@ #error Cannot use this header. #endif -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" GBusType _nm_dbus_bus_type (void); diff --git a/shared/nm-dbus-compat.h b/shared/nm-std-aux/nm-dbus-compat.h similarity index 100% rename from shared/nm-dbus-compat.h rename to shared/nm-std-aux/nm-dbus-compat.h diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c index 8241e07860..3fbf7a63f6 100644 --- a/shared/nm-test-utils-impl.c +++ b/shared/nm-test-utils-impl.c @@ -23,7 +23,7 @@ #include #include "NetworkManager.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-test-libnm-utils.h" diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index dc85a8b287..9cd3a51973 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -35,7 +35,7 @@ #include "nm-device-bt.h" #include "nm-core-internal.h" #include "platform/nm-platform.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" /*****************************************************************************/ diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 9cab0d2412..287f4d1b18 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -37,7 +37,7 @@ #include "nm-config.h" #include "nm-core-internal.h" #include "nm-ip4-config.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "devices/nm-device-logging.h" _LOG_DECLARE_SELF(NMDeviceTeam); diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c index dcc161d28f..4a9503f312 100644 --- a/src/devices/wifi/nm-device-iwd.c +++ b/src/devices/wifi/nm-device-iwd.c @@ -39,7 +39,7 @@ #include "nm-config.h" #include "nm-iwd-manager.h" #include "nm-dbus-manager.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "devices/nm-device-logging.h" _LOG_DECLARE_SELF(NMDeviceIwd); diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c index fac14d69d6..4be089c099 100644 --- a/src/devices/wwan/nm-modem-manager.c +++ b/src/devices/wwan/nm-modem-manager.c @@ -32,7 +32,7 @@ #define sd_booted() FALSE #endif -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-modem.h" #include "nm-modem-broadband.h" diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c index 68ffd80c42..5d262ba3c7 100644 --- a/src/dns/nm-dns-systemd-resolved.c +++ b/src/dns/nm-dns-systemd-resolved.c @@ -42,7 +42,7 @@ #include "nm-setting-connection.h" #include "devices/nm-device.h" #include "NetworkManagerUtils.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1" #define SYSTEMD_RESOLVED_MANAGER_IFACE "org.freedesktop.resolve1.Manager" diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index c1300eaf99..1a455c4280 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -31,7 +31,7 @@ #include "nm-glib-aux/nm-c-list.h" #include "nm-dbus-interface.h" #include "nm-core-internal.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-dbus-object.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-manager.c b/src/nm-manager.c index 61525e204e..51065545f7 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -54,7 +54,7 @@ #include "nm-core-internal.h" #include "nm-config.h" #include "nm-audit-manager.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-checkpoint.h" #include "nm-checkpoint-manager.h" #include "nm-dbus-object.h" diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c index 89272edbb3..5160dbf0e2 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -30,7 +30,7 @@ #include #include -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "nm-setting-connection.h" #include "settings/nm-settings-plugin.h" #include "nm-config.h" diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c index f46689eb02..12d21aba44 100644 --- a/src/supplicant/nm-supplicant-interface.c +++ b/src/supplicant/nm-supplicant-interface.c @@ -29,7 +29,7 @@ #include "NetworkManagerUtils.h" #include "nm-supplicant-config.h" #include "nm-core-internal.h" -#include "nm-dbus-compat.h" +#include "nm-std-aux/nm-dbus-compat.h" #define WPAS_DBUS_IFACE_INTERFACE WPAS_DBUS_INTERFACE ".Interface" #define WPAS_DBUS_IFACE_INTERFACE_WPS WPAS_DBUS_INTERFACE ".Interface.WPS"