diff options
| author | Dan Winship <danw@redhat.com> | 2015-04-06 16:42:31 -0400 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2015-07-24 13:25:47 -0400 |
| commit | 3452ee2a0e3d04a324e7b9cd153323a353d5c182 (patch) | |
| tree | f87c48e6b2d2777ee893f9d6aeabd95ee97bd8ca /src/nm-firewall-manager.c | |
| parent | dd0e19895532504e6de615d18a761457ec685b58 (diff) | |
| download | NetworkManager-3452ee2a0e3d04a324e7b9cd153323a353d5c182.tar.gz | |
all: rename nm-glib-compat.h to nm-glib.h, use everywhere
Rather than randomly including one or more of <glib.h>,
<glib-object.h>, and <gio/gio.h> everywhere (and forgetting to include
"nm-glib-compat.h" most of the time), rename nm-glib-compat.h to
nm-glib.h, include <gio/gio.h> from there, and then change all .c
files in NM to include "nm-glib.h" rather than including the glib
headers directly.
(Public headers files still have to include the real glib headers,
since nm-glib.h isn't installed...)
Also, remove glib includes from header files that are already
including a base object header file (which must itself already include
the glib headers).
Diffstat (limited to 'src/nm-firewall-manager.c')
| -rw-r--r-- | src/nm-firewall-manager.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 9bffac7599..304ee7e932 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -21,9 +21,8 @@ #include "config.h" #include <string.h> -#include <glib.h> -#include <gio/gio.h> +#include "nm-glib.h" #include "nm-firewall-manager.h" #include "nm-logging.h" #include "gsystem-local-alloc.h" |