diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-15 16:07:53 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-16 10:45:54 +0200 |
| commit | 037462e90273ce25335d0a0a461748d3503ce13d (patch) | |
| tree | 5aa5d4c7f00e25422f17f288adb4b8ede30583f0 | |
| parent | 5d55492bac24677f706f048eab01af5ed84a761c (diff) | |
| download | NetworkManager-037462e90273ce25335d0a0a461748d3503ce13d.tar.gz | |
shared: include "gsystem-local-alloc.h" from "nm-glib.h"
"nm-glib.h" is the most basic header, the one we cannot do without.
("nm-default.h", is already more generic, the one which every common
source file in NetworkManager repository should include).
Let "gsystem-local-alloc.h" be included by "nm-glib.h" and nowhere
else.
| -rw-r--r-- | shared/nm-default.h | 1 | ||||
| -rw-r--r-- | shared/nm-utils/nm-glib.h | 2 | ||||
| -rw-r--r-- | shared/nm-utils/nm-vpn-editor-plugin-call.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/shared/nm-default.h b/shared/nm-default.h index bcd3d420c2..6ff34aca52 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -100,7 +100,6 @@ _nm_g_return_if_fail_warning (const char *log_domain, #include "nm-utils/nm-glib.h" #include "nm-version.h" -#include "nm-utils/gsystem-local-alloc.h" #include "nm-utils/nm-macros-internal.h" #include "nm-utils/nm-shared-utils.h" diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-utils/nm-glib.h index 5f8ebc7fdc..46a8bb2d9a 100644 --- a/shared/nm-utils/nm-glib.h +++ b/shared/nm-utils/nm-glib.h @@ -24,6 +24,8 @@ #include <gio/gio.h> #include <string.h> +#include "gsystem-local-alloc.h" + #ifdef __clang__ #undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS diff --git a/shared/nm-utils/nm-vpn-editor-plugin-call.h b/shared/nm-utils/nm-vpn-editor-plugin-call.h index c6b7ee76ab..78d041dff3 100644 --- a/shared/nm-utils/nm-vpn-editor-plugin-call.h +++ b/shared/nm-utils/nm-vpn-editor-plugin-call.h @@ -32,7 +32,6 @@ #include <NetworkManager.h> /* we make use of other internal header files, you need those too. */ -#include "gsystem-local-alloc.h" #include "nm-macros-internal.h" /*****************************************************************************/ |