diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-02-19 14:57:48 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-02-19 17:53:25 +0100 |
| commit | 8bace23bebcc28396460663203d54aac4ec8ffbf (patch) | |
| tree | 1655434d48980dbb4a547f6d56a231252aa0181d /libnm/nm-device-modem.c | |
| parent | 89d6fa6aa93cdc982992c137f0b694cd339c315c (diff) | |
| download | NetworkManager-8bace23bebcc28396460663203d54aac4ec8ffbf.tar.gz | |
all: cleanup includes and let "nm-default.h" include "config.h"
- All internal source files (except "examples", which are not internal)
should include "config.h" first. As also all internal source
files should include "nm-default.h", let "config.h" be included
by "nm-default.h" and include "nm-default.h" as first in every
source file.
We already wanted to include "nm-default.h" before other headers
because it might contains some fixes (like "nm-glib.h" compatibility)
that is required first.
- After including "nm-default.h", we optinally allow for including the
corresponding header file for the source file at hand. The idea
is to ensure that each header file is self contained.
- Don't include "config.h" or "nm-default.h" in any header file
(except "nm-sd-adapt.h"). Public headers anyway must not include
these headers, and internal headers are never included after
"nm-default.h", as of the first previous point.
- Include all internal headers with quotes instead of angle brackets.
In practice it doesn't matter, because in our public headers we must
include other headers with angle brackets. As we use our public
headers also to compile our interal source files, effectively the
result must be the same. Still do it for consistency.
- Except for <config.h> itself. Include it with angle brackets as suggested by
https://www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Headers
Diffstat (limited to 'libnm/nm-device-modem.c')
| -rw-r--r-- | libnm/nm-device-modem.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c index 9fe5acb650..d442dc0342 100644 --- a/libnm/nm-device-modem.c +++ b/libnm/nm-device-modem.c @@ -19,15 +19,14 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-gsm.h> -#include <nm-setting-cdma.h> +#include "nm-setting-connection.h" +#include "nm-setting-gsm.h" +#include "nm-setting-cdma.h" -#include "nm-default.h" #include "nm-device-modem.h" #include "nm-device-private.h" #include "nm-object-private.h" |