diff options
| author | Dan Winship <danw@gnome.org> | 2014-08-13 14:10:11 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-16 10:17:14 -0400 |
| commit | c81fb49aa55b0f3001a372b6034dd04712c1d10f (patch) | |
| tree | 0c70ef49714d510d2fe9dacbf07c068f7844e6c9 /src/rdisc | |
| parent | 76ac21b26d67a680e23c0b3539e02a70798abdbc (diff) | |
| download | NetworkManager-c81fb49aa55b0f3001a372b6034dd04712c1d10f.tar.gz | |
all: fix up multiple-include-guard defines
Previously, src/nm-ip4-config.h, libnm/nm-ip4-config.h, and
libnm-glib/nm-ip4-config.h all used "NM_IP4_CONFIG_H" as an include
guard, which meant that nm-test-utils.h could not tell which of them
was being included (and so, eg, if you tried to include
nm-ip4-config.h in a libnm test, it would fail to compile because
nm-test-utils.h was referring to symbols in src/nm-ip4-config.h).
Fix this by changing the include guards in the non-API-stable parts of
the tree:
- libnm-glib/nm-ip4-config.h remains NM_IP4_CONFIG_H
- libnm/nm-ip4-config.h now uses __NM_IP4_CONFIG_H__
- src/nm-ip4-config.h now uses __NETWORKMANAGER_IP4_CONFIG_H__
And likewise for all other headers.
The two non-"nm"-prefixed headers, libnm/NetworkManager.h and
src/NetworkManagerUtils.h are now __NETWORKMANAGER_H__ and
__NETWORKMANAGER_UTILS_H__ respectively, which, while not entirely
consistent with the general scheme, do still mostly make sense in
isolation.
Diffstat (limited to 'src/rdisc')
| -rw-r--r-- | src/rdisc/nm-fake-rdisc.h | 6 | ||||
| -rw-r--r-- | src/rdisc/nm-lndp-rdisc.h | 6 | ||||
| -rw-r--r-- | src/rdisc/nm-rdisc.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/rdisc/nm-fake-rdisc.h b/src/rdisc/nm-fake-rdisc.h index 248283b22b..b4eff7ecf9 100644 --- a/src/rdisc/nm-fake-rdisc.h +++ b/src/rdisc/nm-fake-rdisc.h @@ -18,8 +18,8 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#ifndef NM_FAKE_RDISC_H -#define NM_FAKE_RDISC_H +#ifndef __NETWORKMANAGER_FAKE_RDISC_H__ +#define __NETWORKMANAGER_FAKE_RDISC_H__ #include "nm-rdisc.h" @@ -46,4 +46,4 @@ GType nm_fake_rdisc_get_type (void); NMRDisc *nm_fake_rdisc_new (int ifindex, const char *ifname); -#endif /* NM_FAKE_RDISC_H */ +#endif /* __NETWORKMANAGER_FAKE_RDISC_H__ */ diff --git a/src/rdisc/nm-lndp-rdisc.h b/src/rdisc/nm-lndp-rdisc.h index eb6a1df6d9..407e1f9258 100644 --- a/src/rdisc/nm-lndp-rdisc.h +++ b/src/rdisc/nm-lndp-rdisc.h @@ -18,8 +18,8 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#ifndef NM_LNDP_RDISC_H -#define NM_LNDP_RDISC_H +#ifndef __NETWORKMANAGER_LNDP_RDISC_H__ +#define __NETWORKMANAGER_LNDP_RDISC_H__ #include "nm-rdisc.h" @@ -46,4 +46,4 @@ GType nm_lndp_rdisc_get_type (void); NMRDisc *nm_lndp_rdisc_new (int ifindex, const char *ifname); -#endif /* NM_LNDP_RDISC_H */ +#endif /* __NETWORKMANAGER_LNDP_RDISC_H__ */ diff --git a/src/rdisc/nm-rdisc.h b/src/rdisc/nm-rdisc.h index 642e7c9670..35db3c917f 100644 --- a/src/rdisc/nm-rdisc.h +++ b/src/rdisc/nm-rdisc.h @@ -18,8 +18,8 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#ifndef NM_RDISC_H -#define NM_RDISC_H +#ifndef __NETWORKMANAGER_RDISC_H__ +#define __NETWORKMANAGER_RDISC_H__ #include <glib-object.h> @@ -138,4 +138,4 @@ GType nm_rdisc_get_type (void); void nm_rdisc_set_iid (NMRDisc *rdisc, const NMUtilsIPv6IfaceId iid); void nm_rdisc_start (NMRDisc *rdisc); -#endif /* NM_RDISC_H */ +#endif /* __NETWORKMANAGER_RDISC_H__ */ |