summaryrefslogtreecommitdiff
path: root/libnm-util
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-03-09 13:02:20 +0100
committerThomas Haller <thaller@redhat.com>2017-03-09 14:12:35 +0100
commit831286df3001e6b76b7baeb10a7723841ab8b35e (patch)
treeb042134ef04427c961379f298512e4200c620901 /libnm-util
parentafd1bde36683fd73516f267dd98160c1b54f4ad7 (diff)
downloadNetworkManager-831286df3001e6b76b7baeb10a7723841ab8b35e.tar.gz
include: use double-quotes to include our own headers
In practice, this should only matter when there are multiple header files with the same name. That is something we try to avoid already, by giving headers a distinct name. When building NetworkManager itself, we clearly want to use double-quotes for including our own headers. But we also want to do that in our public headers. For example: ./a.c #include <stdio.h> #include <nm-1.h> void main() { printf ("INCLUDED %s/nm-2.h\n", SYMB); } ./1/nm-1.h #include <nm-2.h> ./1/nm-2.h #define SYMB "1" ./2/nm-2.h #define SYMB "2" $ cc -I./2 -I./1 ./a.c $ ./a.out INCLUDED 2/nm-2.h Exceptions to this are - headers in "shared/nm-utils" that include <NetworkManager.h>. These headers are copied into projects and hence used like headers owned by those projects. - examples/C
Diffstat (limited to 'libnm-util')
-rw-r--r--libnm-util/NetworkManager.h2
-rw-r--r--libnm-util/nm-connection.h56
-rw-r--r--libnm-util/nm-setting-8021x.h2
-rw-r--r--libnm-util/nm-setting-adsl.h2
-rw-r--r--libnm-util/nm-setting-bond.h2
-rw-r--r--libnm-util/nm-setting-bridge-port.h2
-rw-r--r--libnm-util/nm-setting-bridge.h2
-rw-r--r--libnm-util/nm-setting-cdma.h2
-rw-r--r--libnm-util/nm-setting-dcb.h2
-rw-r--r--libnm-util/nm-setting-generic.h2
-rw-r--r--libnm-util/nm-setting-gsm.h2
-rw-r--r--libnm-util/nm-setting-infiniband.h2
-rw-r--r--libnm-util/nm-setting-olpc-mesh.h2
-rw-r--r--libnm-util/nm-setting-ppp.h2
-rw-r--r--libnm-util/nm-setting-pppoe.h2
-rw-r--r--libnm-util/nm-setting-serial.h2
-rw-r--r--libnm-util/nm-setting-team-port.h2
-rw-r--r--libnm-util/nm-setting-team.h2
-rw-r--r--libnm-util/nm-setting-template.h2
-rw-r--r--libnm-util/nm-setting-vpn.h2
-rw-r--r--libnm-util/nm-setting-wimax.h2
-rw-r--r--libnm-util/nm-setting-wired.h2
-rw-r--r--libnm-util/nm-setting-wireless-security.h2
-rw-r--r--libnm-util/nm-setting-wireless.h6
-rw-r--r--libnm-util/nm-setting.h2
-rw-r--r--libnm-util/nm-version.h2
26 files changed, 55 insertions, 55 deletions
diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
index 77c09ae356..5e1c3f9f6d 100644
--- a/libnm-util/NetworkManager.h
+++ b/libnm-util/NetworkManager.h
@@ -28,7 +28,7 @@
/* This header must not include glib or libnm. */
-#include <nm-version-macros.h>
+#include "nm-version-macros.h"
/*
* dbus services details
diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h
index 2cee2be560..6e119c2c0b 100644
--- a/libnm-util/nm-connection.h
+++ b/libnm-util/nm-connection.h
@@ -25,34 +25,34 @@
#include <glib.h>
#include <glib-object.h>
-#include <nm-setting.h>
-
-#include <nm-setting-8021x.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-bond.h>
-#include <nm-setting-team.h>
-#include <nm-setting-team-port.h>
-#include <nm-setting-bridge.h>
-#include <nm-setting-bridge-port.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-dcb.h>
-#include <nm-setting-generic.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-infiniband.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-olpc-mesh.h>
-#include <nm-setting-ppp.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-serial.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wimax.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-adsl.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-setting-vlan.h>
+#include "nm-setting.h"
+
+#include "nm-setting-8021x.h"
+#include "nm-setting-bluetooth.h"
+#include "nm-setting-bond.h"
+#include "nm-setting-team.h"
+#include "nm-setting-team-port.h"
+#include "nm-setting-bridge.h"
+#include "nm-setting-bridge-port.h"
+#include "nm-setting-cdma.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-dcb.h"
+#include "nm-setting-generic.h"
+#include "nm-setting-gsm.h"
+#include "nm-setting-infiniband.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
+#include "nm-setting-olpc-mesh.h"
+#include "nm-setting-ppp.h"
+#include "nm-setting-pppoe.h"
+#include "nm-setting-serial.h"
+#include "nm-setting-vpn.h"
+#include "nm-setting-wimax.h"
+#include "nm-setting-wired.h"
+#include "nm-setting-adsl.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-setting-vlan.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h
index 62b4390502..3de8f4c37d 100644
--- a/libnm-util/nm-setting-8021x.h
+++ b/libnm-util/nm-setting-8021x.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_8021X_H
#define NM_SETTING_8021X_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-adsl.h b/libnm-util/nm-setting-adsl.h
index 82af6ebdd0..777f0b3636 100644
--- a/libnm-util/nm-setting-adsl.h
+++ b/libnm-util/nm-setting-adsl.h
@@ -22,7 +22,7 @@
#ifndef NM_SETTING_ADSL_H
#define NM_SETTING_ADSL_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-bond.h b/libnm-util/nm-setting-bond.h
index 172bb4cfb5..efef82c882 100644
--- a/libnm-util/nm-setting-bond.h
+++ b/libnm-util/nm-setting-bond.h
@@ -22,7 +22,7 @@
#ifndef NM_SETTING_BOND_H
#define NM_SETTING_BOND_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-bridge-port.h b/libnm-util/nm-setting-bridge-port.h
index fcaf22ed09..76527aefdf 100644
--- a/libnm-util/nm-setting-bridge-port.h
+++ b/libnm-util/nm-setting-bridge-port.h
@@ -22,7 +22,7 @@
#ifndef NM_SETTING_BRIDGE_PORT_H
#define NM_SETTING_BRIDGE_PORT_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-bridge.h b/libnm-util/nm-setting-bridge.h
index f6b59262b8..bd74141591 100644
--- a/libnm-util/nm-setting-bridge.h
+++ b/libnm-util/nm-setting-bridge.h
@@ -22,7 +22,7 @@
#ifndef NM_SETTING_BRIDGE_H
#define NM_SETTING_BRIDGE_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-cdma.h b/libnm-util/nm-setting-cdma.h
index eee4420592..e2c0376eb4 100644
--- a/libnm-util/nm-setting-cdma.h
+++ b/libnm-util/nm-setting-cdma.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_CDMA_H
#define NM_SETTING_CDMA_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-dcb.h b/libnm-util/nm-setting-dcb.h
index ac34521e0d..626f815d91 100644
--- a/libnm-util/nm-setting-dcb.h
+++ b/libnm-util/nm-setting-dcb.h
@@ -22,7 +22,7 @@
#ifndef NM_SETTING_DCB_H
#define NM_SETTING_DCB_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-generic.h b/libnm-util/nm-setting-generic.h
index 1cabae088c..f3b07f69bd 100644
--- a/libnm-util/nm-setting-generic.h
+++ b/libnm-util/nm-setting-generic.h
@@ -22,7 +22,7 @@
#ifndef NM_SETTING_GENERIC_H
#define NM_SETTING_GENERIC_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h
index 564a8b4b9d..438c6b3b32 100644
--- a/libnm-util/nm-setting-gsm.h
+++ b/libnm-util/nm-setting-gsm.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_GSM_H
#define NM_SETTING_GSM_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-infiniband.h b/libnm-util/nm-setting-infiniband.h
index dff3845036..95d343e963 100644
--- a/libnm-util/nm-setting-infiniband.h
+++ b/libnm-util/nm-setting-infiniband.h
@@ -22,7 +22,7 @@
#ifndef NM_SETTING_INFINIBAND_H
#define NM_SETTING_INFINIBAND_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-olpc-mesh.h b/libnm-util/nm-setting-olpc-mesh.h
index 54b268e2c6..1764406ef6 100644
--- a/libnm-util/nm-setting-olpc-mesh.h
+++ b/libnm-util/nm-setting-olpc-mesh.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_OLPC_MESH_H
#define NM_SETTING_OLPC_MESH_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-ppp.h b/libnm-util/nm-setting-ppp.h
index 5733902b83..52856463a4 100644
--- a/libnm-util/nm-setting-ppp.h
+++ b/libnm-util/nm-setting-ppp.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_PPP_H
#define NM_SETTING_PPP_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-pppoe.h b/libnm-util/nm-setting-pppoe.h
index 9d04af9e24..9f8add4e63 100644
--- a/libnm-util/nm-setting-pppoe.h
+++ b/libnm-util/nm-setting-pppoe.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_PPPOE_H
#define NM_SETTING_PPPOE_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-serial.h b/libnm-util/nm-setting-serial.h
index 44d46cf37a..bca9abae92 100644
--- a/libnm-util/nm-setting-serial.h
+++ b/libnm-util/nm-setting-serial.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_SERIAL_H
#define NM_SETTING_SERIAL_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-team-port.h b/libnm-util/nm-setting-team-port.h
index 4e8022202a..2da6518b7a 100644
--- a/libnm-util/nm-setting-team-port.h
+++ b/libnm-util/nm-setting-team-port.h
@@ -21,7 +21,7 @@
#ifndef NM_SETTING_TEAM_PORT_H
#define NM_SETTING_TEAM_PORT_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-team.h b/libnm-util/nm-setting-team.h
index d67c8c71b6..87aa769506 100644
--- a/libnm-util/nm-setting-team.h
+++ b/libnm-util/nm-setting-team.h
@@ -21,7 +21,7 @@
#ifndef NM_SETTING_TEAM_H
#define NM_SETTING_TEAM_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-template.h b/libnm-util/nm-setting-template.h
index d1db77bc65..8e8a270be5 100644
--- a/libnm-util/nm-setting-template.h
+++ b/libnm-util/nm-setting-template.h
@@ -30,7 +30,7 @@
#ifndef NM_SETTING_TEMPLATE_H
#define NM_SETTING_TEMPLATE_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-vpn.h b/libnm-util/nm-setting-vpn.h
index acce6e63b4..ba952f4263 100644
--- a/libnm-util/nm-setting-vpn.h
+++ b/libnm-util/nm-setting-vpn.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_VPN_H
#define NM_SETTING_VPN_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-wimax.h b/libnm-util/nm-setting-wimax.h
index 9d7a07af75..45e533527b 100644
--- a/libnm-util/nm-setting-wimax.h
+++ b/libnm-util/nm-setting-wimax.h
@@ -22,7 +22,7 @@
#ifndef NM_SETTING_WIMAX_H
#define NM_SETTING_WIMAX_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-wired.h b/libnm-util/nm-setting-wired.h
index 33d6d54dde..08a39153af 100644
--- a/libnm-util/nm-setting-wired.h
+++ b/libnm-util/nm-setting-wired.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_WIRED_H
#define NM_SETTING_WIRED_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h
index 97a456b048..1140582b56 100644
--- a/libnm-util/nm-setting-wireless-security.h
+++ b/libnm-util/nm-setting-wireless-security.h
@@ -23,7 +23,7 @@
#ifndef NM_SETTING_WIRELESS_SECURITY_H
#define NM_SETTING_WIRELESS_SECURITY_H
-#include <nm-setting.h>
+#include "nm-setting.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h
index 77eff73e30..5a64f0a0f1 100644
--- a/libnm-util/nm-setting-wireless.h
+++ b/libnm-util/nm-setting-wireless.h
@@ -23,9 +23,9 @@
#ifndef NM_SETTING_WIRELESS_H
#define NM_SETTING_WIRELESS_H
-#include <NetworkManager.h>
-#include <nm-setting.h>
-#include <nm-setting-wireless-security.h>
+#include "NetworkManager.h"
+#include "nm-setting.h"
+#include "nm-setting-wireless-security.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
index 28c6975a8d..ce5cf3f529 100644
--- a/libnm-util/nm-setting.h
+++ b/libnm-util/nm-setting.h
@@ -26,7 +26,7 @@
#include <glib.h>
#include <glib-object.h>
-#include <nm-version.h>
+#include "nm-version.h"
G_BEGIN_DECLS
diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h
index a44d44e607..d4c66ea011 100644
--- a/libnm-util/nm-version.h
+++ b/libnm-util/nm-version.h
@@ -23,7 +23,7 @@
#include <glib.h>
-#include <nm-version-macros.h>
+#include "nm-version-macros.h"
/* Deprecation / Availability macros */