diff options
author | Thomas Haller <thaller@redhat.com> | 2017-03-09 13:02:20 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2017-03-09 14:12:35 +0100 |
commit | 831286df3001e6b76b7baeb10a7723841ab8b35e (patch) | |
tree | b042134ef04427c961379f298512e4200c620901 /libnm-glib | |
parent | afd1bde36683fd73516f267dd98160c1b54f4ad7 (diff) |
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-glib')
-rw-r--r-- | libnm-glib/nm-access-point.c | 10 | ||||
-rw-r--r-- | libnm-glib/nm-access-point.h | 4 | ||||
-rw-r--r-- | libnm-glib/nm-active-connection.h | 4 | ||||
-rw-r--r-- | libnm-glib/nm-client.h | 2 | ||||
-rw-r--r-- | libnm-glib/nm-object.h | 2 | ||||
-rw-r--r-- | libnm-glib/nm-remote-connection.h | 2 | ||||
-rw-r--r-- | libnm-glib/nm-remote-settings.h | 4 | ||||
-rw-r--r-- | libnm-glib/nm-secret-agent.h | 2 | ||||
-rw-r--r-- | libnm-glib/nm-types.h | 2 | ||||
-rw-r--r-- | libnm-glib/nm-vpn-plugin-ui-interface.h | 2 | ||||
-rw-r--r-- | libnm-glib/nm-vpn-plugin-utils.h | 2 | ||||
-rw-r--r-- | libnm-glib/nm-vpn-plugin.h | 4 | ||||
-rw-r--r-- | libnm-glib/nm-wimax-nsp.h | 2 |
13 files changed, 21 insertions, 21 deletions
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 0aef3ee40..892b4a830 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -24,11 +24,11 @@ #include <string.h> #include <netinet/ether.h> -#include <nm-connection.h> -#include <nm-setting-connection.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> -#include <nm-utils.h> +#include "nm-connection.h" +#include "nm-setting-connection.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" +#include "nm-utils.h" #include "nm-access-point.h" #include "NetworkManager.h" diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h index 7ea8f8120..5750c76c5 100644 --- a/libnm-glib/nm-access-point.h +++ b/libnm-glib/nm-access-point.h @@ -24,8 +24,8 @@ #include <glib.h> #include <glib-object.h> -#include <NetworkManager.h> -#include <nm-connection.h> +#include "NetworkManager.h" +#include "nm-connection.h" #include "nm-object.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-active-connection.h b/libnm-glib/nm-active-connection.h index e29415649..cdf02a94e 100644 --- a/libnm-glib/nm-active-connection.h +++ b/libnm-glib/nm-active-connection.h @@ -25,8 +25,8 @@ #include <glib.h> #include <glib-object.h> #include "nm-object.h" -#include <nm-connection.h> -#include <NetworkManager.h> +#include "nm-connection.h" +#include "NetworkManager.h" #include "nm-ip4-config.h" #include "nm-dhcp4-config.h" #include "nm-ip6-config.h" diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h index f10b6e54b..fbbc3d92f 100644 --- a/libnm-glib/nm-client.h +++ b/libnm-glib/nm-client.h @@ -26,7 +26,7 @@ #include <glib-object.h> #include <gio/gio.h> #include <dbus/dbus-glib.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nm-object.h" #include "nm-device.h" #include "nm-active-connection.h" diff --git a/libnm-glib/nm-object.h b/libnm-glib/nm-object.h index 07348f249..73aa9de54 100644 --- a/libnm-glib/nm-object.h +++ b/libnm-glib/nm-object.h @@ -26,7 +26,7 @@ #include <glib-object.h> #include <dbus/dbus-glib.h> -#include <nm-version.h> +#include "nm-version.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-remote-connection.h b/libnm-glib/nm-remote-connection.h index 8292c2354..5b746a445 100644 --- a/libnm-glib/nm-remote-connection.h +++ b/libnm-glib/nm-remote-connection.h @@ -25,7 +25,7 @@ #include <glib-object.h> #include <dbus/dbus-glib.h> -#include <nm-connection.h> +#include "nm-connection.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-remote-settings.h b/libnm-glib/nm-remote-settings.h index 92049adee..af6cc6036 100644 --- a/libnm-glib/nm-remote-settings.h +++ b/libnm-glib/nm-remote-settings.h @@ -24,8 +24,8 @@ #include <gio/gio.h> #include <dbus/dbus-glib.h> -#include <nm-connection.h> -#include <nm-remote-connection.h> +#include "nm-connection.h" +#include "nm-remote-connection.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-secret-agent.h b/libnm-glib/nm-secret-agent.h index b7df87453..621e5e7bf 100644 --- a/libnm-glib/nm-secret-agent.h +++ b/libnm-glib/nm-secret-agent.h @@ -21,7 +21,7 @@ #ifndef NM_SECRET_AGENT_H #define NM_SECRET_AGENT_H -#include <nm-connection.h> +#include "nm-connection.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-types.h b/libnm-glib/nm-types.h index 81bd299e6..9b58cd81e 100644 --- a/libnm-glib/nm-types.h +++ b/libnm-glib/nm-types.h @@ -24,7 +24,7 @@ #include <glib.h> #include <glib-object.h> -#include <nm-glib-enum-types.h> +#include "nm-glib-enum-types.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h index 37fde91f8..b5ea2a7ef 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.h +++ b/libnm-glib/nm-vpn-plugin-ui-interface.h @@ -24,7 +24,7 @@ #include <glib.h> #include <glib-object.h> -#include <nm-connection.h> +#include "nm-connection.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-vpn-plugin-utils.h b/libnm-glib/nm-vpn-plugin-utils.h index d87ef16aa..dfb621cad 100644 --- a/libnm-glib/nm-vpn-plugin-utils.h +++ b/libnm-glib/nm-vpn-plugin-utils.h @@ -22,7 +22,7 @@ #define NM_VPN_PLUGIN_UTILS_H #include <glib.h> -#include <nm-setting.h> +#include "nm-setting.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-vpn-plugin.h b/libnm-glib/nm-vpn-plugin.h index 323017f03..a33349a19 100644 --- a/libnm-glib/nm-vpn-plugin.h +++ b/libnm-glib/nm-vpn-plugin.h @@ -25,8 +25,8 @@ #include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> -#include <NetworkManagerVPN.h> -#include <nm-connection.h> +#include "NetworkManagerVPN.h" +#include "nm-connection.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-wimax-nsp.h b/libnm-glib/nm-wimax-nsp.h index 74008d18e..336f331dd 100644 --- a/libnm-glib/nm-wimax-nsp.h +++ b/libnm-glib/nm-wimax-nsp.h @@ -24,7 +24,7 @@ #include <glib.h> #include <glib-object.h> -#include <NetworkManager.h> +#include "NetworkManager.h" #include "nm-object.h" G_BEGIN_DECLS |