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-glib | |
| parent | 40d5749ec1c9d9aed746115dcf50d9bf1fbad131 (diff) | |
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-glib')
| -rw-r--r-- | libnm-glib/nm-dbus-helpers-private.h | 2 | ||||
| -rw-r--r-- | libnm-glib/nm-object-cache.h | 1 | ||||
| -rw-r--r-- | libnm-glib/nm-object-private.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/libnm-glib/nm-dbus-helpers-private.h b/libnm-glib/nm-dbus-helpers-private.h index c78bf1dae5..1d98e77d9d 100644 --- a/libnm-glib/nm-dbus-helpers-private.h +++ b/libnm-glib/nm-dbus-helpers-private.h @@ -24,8 +24,6 @@ #include <dbus/dbus.h> #include <dbus/dbus-glib-lowlevel.h> -#include "nm-default.h" - DBusGConnection *_nm_dbus_new_connection (GError **error); DBusGProxy * _nm_dbus_new_proxy_for_connection (DBusGConnection *connection, diff --git a/libnm-glib/nm-object-cache.h b/libnm-glib/nm-object-cache.h index 30b62f08ce..03229d566b 100644 --- a/libnm-glib/nm-object-cache.h +++ b/libnm-glib/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-glib/nm-object-private.h b/libnm-glib/nm-object-private.h index 8878354f55..2d3d8f9cb0 100644 --- a/libnm-glib/nm-object-private.h +++ b/libnm-glib/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" void _nm_object_ensure_inited (NMObject *object); |