diff options
author | Thomas Haller <thaller@redhat.com> | 2016-08-17 18:19:00 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-08-17 19:51:17 +0200 |
commit | 0bdcab100ca5fd86ec8ab0f9ccc3645b47835437 (patch) | |
tree | 50865418973a9ad98def8a7d3e2528e0c9ff98f3 /libnm | |
parent | 40d5749ec1c9d9aed746115dcf50d9bf1fbad131 (diff) | |
download | NetworkManager-0bdcab100ca5fd86ec8ab0f9ccc3645b47835437.tar.gz |
all: cleanup includes in header files
- don't include "nm-default.h" in header files. Every source file must
include as first header "nm-default.h", thus our headers get the
default include already implicitly.
- we don't support compiling NetworkManager itself with a C++ compiler. Remove
G_BEGIN_DECLS/G_END_DECLS from internal headers. We do however support
users of libnm to use C++, thus they stay in public headers.
(cherry picked from commit f19aff89095ca192b8b2e37534b7a899aecd82f9)
Diffstat (limited to 'libnm')
-rw-r--r-- | libnm/nm-dbus-helpers.h | 2 | ||||
-rw-r--r-- | libnm/nm-object-cache.h | 1 | ||||
-rw-r--r-- | libnm/nm-object-private.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h index 497739f0ac..4ec8988a17 100644 --- a/libnm/nm-dbus-helpers.h +++ b/libnm/nm-dbus-helpers.h @@ -21,8 +21,6 @@ #ifndef __NM_DBUS_HELPERS_PRIVATE_H__ #define __NM_DBUS_HELPERS_PRIVATE_H__ - -#include "nm-default.h" #include "nm-dbus-compat.h" GBusType _nm_dbus_bus_type (void); diff --git a/libnm/nm-object-cache.h b/libnm/nm-object-cache.h index c0f70f21cc..b29692faa1 100644 --- a/libnm/nm-object-cache.h +++ b/libnm/nm-object-cache.h @@ -21,7 +21,6 @@ #ifndef __NM_OBJECT_CACHE_H__ #define __NM_OBJECT_CACHE_H__ -#include "nm-default.h" #include "nm-object.h" G_BEGIN_DECLS diff --git a/libnm/nm-object-private.h b/libnm/nm-object-private.h index 7e8066f4ee..ad78f92ba0 100644 --- a/libnm/nm-object-private.h +++ b/libnm/nm-object-private.h @@ -21,7 +21,6 @@ #ifndef __NM_OBJECT_PRIVATE_H__ #define __NM_OBJECT_PRIVATE_H__ -#include "nm-default.h" #include "nm-object.h" typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GVariant *, gpointer); |