diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-26 02:19:30 +0200 |
| commit | 229bfa11c4d56b4c1017c81c7dbafbedd15e3153 (patch) | |
| tree | edfc7357b6494a5c0cb016bb88d61b623daa9876 /src/devices/nm-device-bridge.h | |
| parent | 6318db9c78b4fe207dfe700cfac11a675fc63dc9 (diff) | |
| parent | 7514efc2f38c9ace4557d4e69d68e7d380389030 (diff) | |
Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
Diffstat (limited to 'src/devices/nm-device-bridge.h')
| -rw-r--r-- | src/devices/nm-device-bridge.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/devices/nm-device-bridge.h b/src/devices/nm-device-bridge.h index 46482675..05da9ed7 100644 --- a/src/devices/nm-device-bridge.h +++ b/src/devices/nm-device-bridge.h @@ -21,11 +21,8 @@ #ifndef __NETWORKMANAGER_DEVICE_BRIDGE_H__ #define __NETWORKMANAGER_DEVICE_BRIDGE_H__ -#include "nm-default.h" #include "nm-device.h" -G_BEGIN_DECLS - #define NM_TYPE_DEVICE_BRIDGE (nm_device_bridge_get_type ()) #define NM_DEVICE_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridge)) #define NM_DEVICE_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_BRIDGE, NMDeviceBridgeClass)) @@ -38,6 +35,4 @@ typedef NMDeviceClass NMDeviceBridgeClass; GType nm_device_bridge_get_type (void); -G_END_DECLS - -#endif /* NM_DEVICE_BRIDGE_H */ +#endif /* __NETWORKMANAGER_DEVICE_BRIDGE_H__ */ |