summaryrefslogtreecommitdiff
path: root/libnm/NetworkManager.h
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-10-22 13:48:18 -0400
committerDan Winship <danw@gnome.org>2014-11-07 07:49:40 -0500
commitca18b2d44290c938894dc63f7b03d04a3be271bc (patch)
tree9fdf5a36bd0de1c788fa810864801f5c4495f2cc /libnm/NetworkManager.h
parentd34910b12860eb080b1a519f441946cbc378f769 (diff)
downloadNetworkManager-ca18b2d44290c938894dc63f7b03d04a3be271bc.tar.gz
libnm: create NMDhcpConfig as parent of NMDhcp4Config and NMDhcp6Config
As with NMIP4Config and NMIP6Config, merge the two DHCP config classes into one in the public API.
Diffstat (limited to 'libnm/NetworkManager.h')
-rw-r--r--libnm/NetworkManager.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index 7604e77df5..39212fda1d 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -43,8 +43,7 @@
#include <nm-device-wifi.h>
#include <nm-device-wimax.h>
#include <nm-device.h>
-#include <nm-dhcp4-config.h>
-#include <nm-dhcp6-config.h>
+#include <nm-dhcp-config.h>
#include <nm-enum-types.h>
#include <nm-ip-config.h>
#include <nm-object.h>