system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: rename "nm-dhcp4-config.[ch]" to "nm-dhcp-config.[hc]" before merge

Browse source 
NMDhcp4Config and NMDhcp6Config will get a common base type NMDhcpConfig
and be merged. In preparation, rename the file.
This commit is contained in:
Thomas Haller 2020-02-20 14:09:33 +01:00
parent c8d043dd94
commit cd03d39a6d
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -2277,8 +2277,8 @@ src_libNetworkManager_la_SOURCES = \
src/nm-dcb.h \
src/nm-netns.c \
src/nm-netns.h \
src/nm-dhcp4-config.c \
src/nm-dhcp4-config.h \
src/nm-dhcp-config.c \
src/nm-dhcp-config.h \
src/nm-dhcp6-config.c \
src/nm-dhcp6-config.h \
src/nm-dispatcher.c \

2
src/devices/nm-device.c
View file

@ -43,7 +43,7 @@
#include "nm-ip6-config.h"
#include "nm-pacrunner-manager.h"
#include "dnsmasq/nm-dnsmasq-manager.h"
#include "nm-dhcp4-config.h"
#include "nm-dhcp-config.h"
#include "nm-dhcp6-config.h"
#include "nm-rfkill-manager.h"
#include "nm-firewall-manager.h"

2
src/dhcp/nm-dhcp-manager.h
View file

@ -9,7 +9,7 @@
#include "nm-dhcp-client.h"
#include "nm-ip4-config.h"
#include "nm-dhcp4-config.h"
#include "nm-dhcp-config.h"
#define NM_TYPE_DHCP_MANAGER (nm_dhcp_manager_get_type ())
#define NM_DHCP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_MANAGER, NMDhcpManager))

2
src/meson.build
View file

@ -135,7 +135,7 @@ sources = files(
'nm-config-data.c',
'nm-connectivity.c',
'nm-dcb.c',
'nm-dhcp4-config.c',
'nm-dhcp-config.c',
'nm-dhcp6-config.c',
'nm-dispatcher.c',
'nm-firewall-manager.c',

2
src/nm-dhcp4-config.c → src/nm-dhcp-config.c
View file

@ -5,7 +5,7 @@
#include "nm-default.h"
#include "nm-dhcp4-config.h"
#include "nm-dhcp-config.h"
#include "nm-dbus-interface.h"
#include "nm-utils.h"

0
src/nm-dhcp4-config.h → src/nm-dhcp-config.h
View file

2
src/nm-dispatcher.c
View file

@ -14,7 +14,7 @@
#include "nm-connectivity.h"
#include "nm-act-request.h"
#include "devices/nm-device.h"
#include "nm-dhcp4-config.h"
#include "nm-dhcp-config.h"
#include "nm-dhcp6-config.h"
#include "nm-proxy-config.h"
#include "nm-ip4-config.h"

2
src/nm-policy.c
View file

@ -29,7 +29,7 @@
#include "settings/nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "settings/nm-agent-manager.h"
#include "nm-dhcp4-config.h"
#include "nm-dhcp-config.h"
#include "nm-dhcp6-config.h"
#include "nm-config.h"
#include "nm-netns.h"