about summary refs log tree commit diff
path: root/src/nm-exported-object.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-08-26 02:19:30 +0200
committerMichael Biebl <biebl@debian.org>2016-08-26 02:19:30 +0200
commit229bfa11c4d56b4c1017c81c7dbafbedd15e3153 (patch)
treeedfc7357b6494a5c0cb016bb88d61b623daa9876 /src/nm-exported-object.h
parent6318db9c78b4fe207dfe700cfac11a675fc63dc9 (diff)
parent7514efc2f38c9ace4557d4e69d68e7d380389030 (diff)
Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
Diffstat (limited to 'src/nm-exported-object.h')
-rw-r--r--src/nm-exported-object.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/nm-exported-object.h b/src/nm-exported-object.h
index c2c22804..7036e0d0 100644
--- a/src/nm-exported-object.h
+++ b/src/nm-exported-object.h
@@ -21,10 +21,6 @@
 #ifndef NM_EXPORTED_OBJECT_H
 #define NM_EXPORTED_OBJECT_H
 
-#include "nm-default.h"
-
-G_BEGIN_DECLS
-
 /*****************************************************************************/
 
 char *nm_exported_object_skeletonify_method_name (const char *dbus_method_name);
@@ -79,6 +75,4 @@ GDBusInterfaceSkeleton *nm_exported_object_get_interface_by_type (NMExportedObje
 void        _nm_exported_object_clear_and_unexport (NMExportedObject **location);
 #define nm_exported_object_clear_and_unexport(location) _nm_exported_object_clear_and_unexport ((NMExportedObject **) (location))
 
-G_END_DECLS
-
-#endif	/* NM_EXPORTED_OBJECT_H */
+#endif /* NM_EXPORTED_OBJECT_H */