From c81fb49aa55b0f3001a372b6034dd04712c1d10f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 13 Aug 2014 14:10:11 -0400 Subject: 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. --- libnm/nm-device-generic.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libnm/nm-device-generic.h') diff --git a/libnm/nm-device-generic.h b/libnm/nm-device-generic.h index 4b2ead7602..d6160be671 100644 --- a/libnm/nm-device-generic.h +++ b/libnm/nm-device-generic.h @@ -18,8 +18,8 @@ * Copyright 2013 Red Hat, Inc. */ -#ifndef NM_DEVICE_GENERIC_H -#define NM_DEVICE_GENERIC_H +#ifndef __NM_DEVICE_GENERIC_H__ +#define __NM_DEVICE_GENERIC_H__ #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #error "Only can be included directly." @@ -71,4 +71,4 @@ const char *nm_device_generic_get_hw_address (NMDeviceGeneric *device); G_END_DECLS -#endif /* NM_DEVICE_GENERIC_H */ +#endif /* __NM_DEVICE_GENERIC_H__ */ -- cgit v1.2.1