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 /libnm/nm-device-adsl.h | |
| 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 'libnm/nm-device-adsl.h')
| -rw-r--r-- | libnm/nm-device-adsl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm/nm-device-adsl.h b/libnm/nm-device-adsl.h index 26af4a4416..3c175f0f86 100644 --- a/libnm/nm-device-adsl.h +++ b/libnm/nm-device-adsl.h @@ -18,8 +18,8 @@ * Copyright 2011 Pantelis Koukousoulas <pktoss@gmail.com> */ -#ifndef NM_DEVICE_ADSL_H -#define NM_DEVICE_ADSL_H +#ifndef __NM_DEVICE_ADSL_H__ +#define __NM_DEVICE_ADSL_H__ #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #error "Only <NetworkManager.h> can be included directly." @@ -70,4 +70,4 @@ gboolean nm_device_adsl_get_carrier (NMDeviceAdsl *device); G_END_DECLS -#endif /* NM_DEVICE_ADSL_H */ +#endif /* __NM_DEVICE_ADSL_H__ */ |