summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-04-28 18:58:08 +0200
committerThomas Haller <thaller@redhat.com>2016-04-28 19:02:58 +0200
commitf027b71f6597f5081c87b70e044a4d0c4202766d (patch)
tree45c596453147cbb14ea6a41877566d794e0b8b48
parent497a21fb3dad43fb4394dd0fe2e6ea3d43f9046e (diff)
downloadNetworkManager-f027b71f6597f5081c87b70e044a4d0c4202766d.tar.gz
build: cleanup include of <config.h>
It is recomended to include <config.h> with angle brackets [1]. Note, that usually we don't include <config.h> directly, except in two places we have to (because there we include conflicting libraries that must be included before "nm-default.h"). In that case, define __CONFIG_H__ which is used as include guard around <config.h> by "nm-default.h". [1] https://www.gnu.org/software/autoconf/manual/autoconf-2.66/html_node/Configuration-Headers.html
-rw-r--r--src/dhcp-manager/nm-dhcp-dhclient.c3
-rw-r--r--src/ppp-manager/nm-pppd-plugin.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 4b6d301b50..17517c2f16 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -18,7 +18,8 @@
* Copyright (C) 2005 - 2012 Red Hat, Inc.
*/
-#include "config.h"
+#include <config.h>
+#define __CONFIG_H__
#define _XOPEN_SOURCE
#include <time.h>
diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c
index 4c16f1f0f1..9c47c339a3 100644
--- a/src/ppp-manager/nm-pppd-plugin.c
+++ b/src/ppp-manager/nm-pppd-plugin.c
@@ -19,7 +19,7 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#include "config.h"
+#include <config.h>
#define ___CONFIG_H__
#include <string.h>