summaryrefslogtreecommitdiff
path: root/libnm/nm-types.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/nm-types.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/nm-types.h')
-rw-r--r--libnm/nm-types.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libnm/nm-types.h b/libnm/nm-types.h
index eb922036d0..3602878a6a 100644
--- a/libnm/nm-types.h
+++ b/libnm/nm-types.h
@@ -43,8 +43,7 @@ typedef struct _NMDeviceTeam NMDeviceTeam;
typedef struct _NMDeviceVlan NMDeviceVlan;
typedef struct _NMDeviceWifi NMDeviceWifi;
typedef struct _NMDeviceWimax NMDeviceWimax;
-typedef struct _NMDhcp4Config NMDhcp4Config;
-typedef struct _NMDhcp6Config NMDhcp6Config;
+typedef struct _NMDhcpConfig NMDhcpConfig;
typedef struct _NMIPConfig NMIPConfig;
typedef struct _NMObject NMObject;
typedef struct _NMRemoteConnection NMRemoteConnection;