summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-02-19 14:57:48 +0100
committerThomas Haller <thaller@redhat.com>2016-02-19 17:53:25 +0100
commit8bace23bebcc28396460663203d54aac4ec8ffbf (patch)
tree1655434d48980dbb4a547f6d56a231252aa0181d /examples
parent89d6fa6aa93cdc982992c137f0b694cd339c315c (diff)
downloadNetworkManager-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 'examples')
-rw-r--r--examples/C/glib/add-connection-gdbus.c2
-rw-r--r--examples/C/glib/add-connection-libnm.c2
-rw-r--r--examples/C/glib/get-active-connections-gdbus.c2
-rw-r--r--examples/C/glib/get-ap-info-libnm.c2
-rw-r--r--examples/C/glib/list-connections-gdbus.c2
-rw-r--r--examples/C/glib/list-connections-libnm.c2
-rw-r--r--examples/C/glib/monitor-nm-running-gdbus.c2
-rw-r--r--examples/C/glib/monitor-nm-state-gdbus.c2
8 files changed, 0 insertions, 16 deletions
diff --git a/examples/C/glib/add-connection-gdbus.c b/examples/C/glib/add-connection-gdbus.c
index d390327399..7a4d593945 100644
--- a/examples/C/glib/add-connection-gdbus.c
+++ b/examples/C/glib/add-connection-gdbus.c
@@ -27,8 +27,6 @@
* gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` -luuid add-connection-gdbus.c -o add-connection-gdbus
*/
-#include "config.h"
-
#include <gio/gio.h>
#include <uuid/uuid.h>
#include <NetworkManager.h>
diff --git a/examples/C/glib/add-connection-libnm.c b/examples/C/glib/add-connection-libnm.c
index 75048bd8f1..f206340e0c 100644
--- a/examples/C/glib/add-connection-libnm.c
+++ b/examples/C/glib/add-connection-libnm.c
@@ -27,8 +27,6 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` add-connection-libnm.c -o add-connection-libnm
*/
-#include "config.h"
-
#include <glib.h>
#include <NetworkManager.h>
diff --git a/examples/C/glib/get-active-connections-gdbus.c b/examples/C/glib/get-active-connections-gdbus.c
index 9b34f6b210..6a19bf895e 100644
--- a/examples/C/glib/get-active-connections-gdbus.c
+++ b/examples/C/glib/get-active-connections-gdbus.c
@@ -26,8 +26,6 @@
* gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` get-active-connections-gdbus.c -o get-active-connections-gdbus
*/
-#include "config.h"
-
#include <string.h>
#include <gio/gio.h>
#include <NetworkManager.h>
diff --git a/examples/C/glib/get-ap-info-libnm.c b/examples/C/glib/get-ap-info-libnm.c
index 90bc2d5e78..5868c27904 100644
--- a/examples/C/glib/get-ap-info-libnm.c
+++ b/examples/C/glib/get-ap-info-libnm.c
@@ -25,8 +25,6 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` get-ap-info-libnm.c -o get-ap-info-libnm
*/
-#include "config.h"
-
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/C/glib/list-connections-gdbus.c b/examples/C/glib/list-connections-gdbus.c
index 634bd90c82..f5922582ea 100644
--- a/examples/C/glib/list-connections-gdbus.c
+++ b/examples/C/glib/list-connections-gdbus.c
@@ -27,8 +27,6 @@
* gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` list-connections-gdbus.c -o list-connections-gdbus
*/
-#include "config.h"
-
#include <gio/gio.h>
#include <NetworkManager.h>
diff --git a/examples/C/glib/list-connections-libnm.c b/examples/C/glib/list-connections-libnm.c
index d5cdf361d7..f09c028b6b 100644
--- a/examples/C/glib/list-connections-libnm.c
+++ b/examples/C/glib/list-connections-libnm.c
@@ -26,8 +26,6 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` list-connections-libnm.c -o list-connections-libnm
*/
-#include "config.h"
-
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/C/glib/monitor-nm-running-gdbus.c b/examples/C/glib/monitor-nm-running-gdbus.c
index e4b3bbbfc9..2e1a11c0c8 100644
--- a/examples/C/glib/monitor-nm-running-gdbus.c
+++ b/examples/C/glib/monitor-nm-running-gdbus.c
@@ -28,8 +28,6 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` monitor-nm-running-gdbus.c -o monitor-nm-running-gdbus
*/
-#include "config.h"
-
#include <gio/gio.h>
static void
diff --git a/examples/C/glib/monitor-nm-state-gdbus.c b/examples/C/glib/monitor-nm-state-gdbus.c
index aeabcfe16e..05596399d9 100644
--- a/examples/C/glib/monitor-nm-state-gdbus.c
+++ b/examples/C/glib/monitor-nm-state-gdbus.c
@@ -29,8 +29,6 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` `pkg-config --cflags libnm` monitor-nm-state-gdbus.c -o monitor-nm-state-gdbus
*/
-#include "config.h"
-
#include <gio/gio.h>
#include <string.h>
#include <nm-dbus-interface.h>