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 | |
| 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')
110 files changed, 295 insertions, 295 deletions
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index bb5043fa65..8b532b78a6 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -19,8 +19,8 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#ifndef NETWORK_MANAGER_UTILS_H -#define NETWORK_MANAGER_UTILS_H +#ifndef __NETWORKMANAGER_UTILS_H__ +#define __NETWORKMANAGER_UTILS_H__ #include <glib.h> #include <stdio.h> @@ -162,4 +162,4 @@ void nm_utils_ipv6_addr_set_interface_identfier (struct in6_addr *addr, void nm_utils_ipv6_interface_identfier_get_from_addr (NMUtilsIPv6IfaceId *iid, const struct in6_addr *addr); -#endif /* NETWORK_MANAGER_UTILS_H */ +#endif /* __NETWORKMANAGER_UTILS_H__ */ diff --git a/src/devices/adsl/nm-atm-manager.h b/src/devices/adsl/nm-atm-manager.h index 0052522075..e4ec3e6aee 100644 --- a/src/devices/adsl/nm-atm-manager.h +++ b/src/devices/adsl/nm-atm-manager.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2014 Red Hat, Inc. */ -#ifndef NM_ATM_MANAGER_H -#define NM_ATM_MANAGER_H +#ifndef __NETWORKMANAGER_ATM_MANAGER_H__ +#define __NETWORKMANAGER_ATM_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -38,5 +38,5 @@ typedef struct { GObjectClass parent; } NMAtmManagerClass; -#endif /* NM_ATM_MANAGER_H */ +#endif /* __NETWORKMANAGER_ATM_MANAGER_H__ */ diff --git a/src/devices/adsl/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h index bbd0e63f0f..f21381c21f 100644 --- a/src/devices/adsl/nm-device-adsl.h +++ b/src/devices/adsl/nm-device-adsl.h @@ -19,8 +19,8 @@ * Copyright (C) 2009 - 2011 Red Hat Inc. */ -#ifndef NM_DEVICE_ADSL_H -#define NM_DEVICE_ADSL_H +#ifndef __NETWORKMANAGER_DEVICE_ADSL_H__ +#define __NETWORKMANAGER_DEVICE_ADSL_H__ #include <glib-object.h> diff --git a/src/devices/bluetooth/nm-bluez-common.h b/src/devices/bluetooth/nm-bluez-common.h index f80cfc2e39..f0cab43b34 100644 --- a/src/devices/bluetooth/nm-bluez-common.h +++ b/src/devices/bluetooth/nm-bluez-common.h @@ -18,8 +18,8 @@ * Copyright (C) 2009 Red Hat, Inc. */ -#ifndef NM_BLUEZ_COMMON_H -#define NM_BLUEZ_COMMON_H +#ifndef __NETWORKMANAGER_BLUEZ_COMMON_H__ +#define __NETWORKMANAGER_BLUEZ_COMMON_H__ #include <config.h> diff --git a/src/devices/bluetooth/nm-bluez-device.h b/src/devices/bluetooth/nm-bluez-device.h index 0bf7d898b0..6b8dc97a75 100644 --- a/src/devices/bluetooth/nm-bluez-device.h +++ b/src/devices/bluetooth/nm-bluez-device.h @@ -18,8 +18,8 @@ * Copyright (C) 2009 - 2014 Red Hat, Inc. */ -#ifndef NM_BLUEZ_DEVICE_H -#define NM_BLUEZ_DEVICE_H +#ifndef __NETWORKMANAGER_BLUEZ_DEVICE_H__ +#define __NETWORKMANAGER_BLUEZ_DEVICE_H__ #include <glib.h> #include <glib-object.h> @@ -94,5 +94,5 @@ nm_bluez_device_connect_finish (NMBluezDevice *self, void nm_bluez_device_disconnect (NMBluezDevice *self); -#endif /* NM_BLUEZ_DEVICE_H */ +#endif /* __NETWORKMANAGER_BLUEZ_DEVICE_H__ */ diff --git a/src/devices/bluetooth/nm-bluez-manager.h b/src/devices/bluetooth/nm-bluez-manager.h index 68d6dbe5e8..8320b2987f 100644 --- a/src/devices/bluetooth/nm-bluez-manager.h +++ b/src/devices/bluetooth/nm-bluez-manager.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2014 Red Hat, Inc. */ -#ifndef NM_BLUEZ_MANAGER_H -#define NM_BLUEZ_MANAGER_H +#ifndef __NETWORKMANAGER_BLUEZ_MANAGER_H__ +#define __NETWORKMANAGER_BLUEZ_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -40,5 +40,5 @@ typedef struct { GObjectClass parent; } NMBluezManagerClass; -#endif /* NM_BLUEZ_MANAGER_H */ +#endif /* __NETWORKMANAGER_BLUEZ_MANAGER_H__ */ diff --git a/src/devices/bluetooth/nm-bluez4-adapter.h b/src/devices/bluetooth/nm-bluez4-adapter.h index 454ca557eb..a62564127a 100644 --- a/src/devices/bluetooth/nm-bluez4-adapter.h +++ b/src/devices/bluetooth/nm-bluez4-adapter.h @@ -18,8 +18,8 @@ * Copyright (C) 2009 - 2012 Red Hat, Inc. */ -#ifndef NM_BLUEZ4_ADAPTER_H -#define NM_BLUEZ4_ADAPTER_H +#ifndef __NETWORKMANAGER_BLUEZ4_ADAPTER_H__ +#define __NETWORKMANAGER_BLUEZ4_ADAPTER_H__ #include <glib.h> #include <glib-object.h> @@ -65,5 +65,5 @@ gboolean nm_bluez4_adapter_get_initialized (NMBluez4Adapter *self); GSList *nm_bluez4_adapter_get_devices (NMBluez4Adapter *self); -#endif /* NM_BLUEZ4_ADAPTER_H */ +#endif /* __NETWORKMANAGER_BLUEZ4_ADAPTER_H__ */ diff --git a/src/devices/bluetooth/nm-bluez4-manager.h b/src/devices/bluetooth/nm-bluez4-manager.h index 19b1c65a1b..13cfef9398 100644 --- a/src/devices/bluetooth/nm-bluez4-manager.h +++ b/src/devices/bluetooth/nm-bluez4-manager.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#ifndef NM_BLUEZ4_MANAGER_H -#define NM_BLUEZ4_MANAGER_H +#ifndef __NETWORKMANAGER_BLUEZ4_MANAGER_H__ +#define __NETWORKMANAGER_BLUEZ4_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -58,5 +58,5 @@ NMBluez4Manager *nm_bluez4_manager_new (NMConnectionProvider *provider); void nm_bluez4_manager_query_devices (NMBluez4Manager *manager); -#endif /* NM_BLUEZ4_MANAGER_H */ +#endif /* __NETWORKMANAGER_BLUEZ4_MANAGER_H__ */ diff --git a/src/devices/bluetooth/nm-bluez5-manager.h b/src/devices/bluetooth/nm-bluez5-manager.h index 79f347bcef..8152976dc4 100644 --- a/src/devices/bluetooth/nm-bluez5-manager.h +++ b/src/devices/bluetooth/nm-bluez5-manager.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#ifndef NM_BLUEZ5_MANAGER_H -#define NM_BLUEZ5_MANAGER_H +#ifndef __NETWORKMANAGER_BLUEZ5_MANAGER_H__ +#define __NETWORKMANAGER_BLUEZ5_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -58,5 +58,5 @@ NMBluez5Manager *nm_bluez5_manager_new (NMConnectionProvider *provider); void nm_bluez5_manager_query_devices (NMBluez5Manager *manager); -#endif /* NM_BLUEZ5_MANAGER_H */ +#endif /* __NETWORKMANAGER_BLUEZ5_MANAGER_H__ */ diff --git a/src/devices/bluetooth/nm-device-bt.h b/src/devices/bluetooth/nm-device-bt.h index 83732bc09e..6e6ae546ca 100644 --- a/src/devices/bluetooth/nm-device-bt.h +++ b/src/devices/bluetooth/nm-device-bt.h @@ -18,8 +18,8 @@ * Copyright (C) 2009 Red Hat, Inc. */ -#ifndef NM_DEVICE_BT_H -#define NM_DEVICE_BT_H +#ifndef __NETWORKMANAGER_DEVICE_BT_H__ +#define __NETWORKMANAGER_DEVICE_BT_H__ #include <nm-device.h> #include "nm-bluez-device.h" @@ -71,4 +71,4 @@ gboolean nm_device_bt_modem_added (NMDeviceBt *device, G_END_DECLS -#endif /* NM_DEVICE_BT_H */ +#endif /* __NETWORKMANAGER_DEVICE_BT_H__ */ diff --git a/src/devices/nm-device-bond.h b/src/devices/nm-device-bond.h index f4683ad855..216589387a 100644 --- a/src/devices/nm-device-bond.h +++ b/src/devices/nm-device-bond.h @@ -18,8 +18,8 @@ * Copyright 2012 Red Hat, Inc. */ -#ifndef NM_DEVICE_BOND_H -#define NM_DEVICE_BOND_H +#ifndef __NETWORKMANAGER_DEVICE_BOND_H__ +#define __NETWORKMANAGER_DEVICE_BOND_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-bridge.h b/src/devices/nm-device-bridge.h index 5570c73555..d39d64e559 100644 --- a/src/devices/nm-device-bridge.h +++ b/src/devices/nm-device-bridge.h @@ -18,8 +18,8 @@ * Copyright 2012 Red Hat, Inc. */ -#ifndef NM_DEVICE_BRIDGE_H -#define NM_DEVICE_BRIDGE_H +#ifndef __NETWORKMANAGER_DEVICE_BRIDGE_H__ +#define __NETWORKMANAGER_DEVICE_BRIDGE_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h index bcaf270a03..c0ad7f2e24 100644 --- a/src/devices/nm-device-ethernet.h +++ b/src/devices/nm-device-ethernet.h @@ -19,8 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#ifndef NM_DEVICE_ETHERNET_H -#define NM_DEVICE_ETHERNET_H +#ifndef __NETWORKMANAGER_DEVICE_ETHERNET_H__ +#define __NETWORKMANAGER_DEVICE_ETHERNET_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-factory.h b/src/devices/nm-device-factory.h index 08d9743fb1..0f3871021e 100644 --- a/src/devices/nm-device-factory.h +++ b/src/devices/nm-device-factory.h @@ -18,8 +18,8 @@ * Copyright (C) 2007 - 2014 Red Hat, Inc. */ -#ifndef NM_DEVICE_FACTORY_H -#define NM_DEVICE_FACTORY_H +#ifndef __NETWORKMANAGER_DEVICE_FACTORY_H__ +#define __NETWORKMANAGER_DEVICE_FACTORY_H__ #include <glib.h> #include <glib-object.h> @@ -153,5 +153,5 @@ NMDevice * nm_device_factory_create_virtual_device_for_connection (NMDeviceFacto gboolean nm_device_factory_emit_component_added (NMDeviceFactory *factory, GObject *component); -#endif /* NM_DEVICE_FACTORY_H */ +#endif /* __NETWORKMANAGER_DEVICE_FACTORY_H__ */ diff --git a/src/devices/nm-device-generic.h b/src/devices/nm-device-generic.h index e7b7090b17..1decc2eb6c 100644 --- a/src/devices/nm-device-generic.h +++ b/src/devices/nm-device-generic.h @@ -18,8 +18,8 @@ * Copyright 2013 Red Hat, Inc. */ -#ifndef NM_DEVICE_GENERIC_H -#define NM_DEVICE_GENERIC_H +#ifndef __NETWORKMANAGER_DEVICE_GENERIC_H__ +#define __NETWORKMANAGER_DEVICE_GENERIC_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-gre.h b/src/devices/nm-device-gre.h index 610b380507..b3f8b984c0 100644 --- a/src/devices/nm-device-gre.h +++ b/src/devices/nm-device-gre.h @@ -18,8 +18,8 @@ * Copyright 2013 Red Hat, Inc. */ -#ifndef NM_DEVICE_GRE_H -#define NM_DEVICE_GRE_H +#ifndef __NETWORKMANAGER_DEVICE_GRE_H__ +#define __NETWORKMANAGER_DEVICE_GRE_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-infiniband.h b/src/devices/nm-device-infiniband.h index 45dc1ab6a0..032fbddf7b 100644 --- a/src/devices/nm-device-infiniband.h +++ b/src/devices/nm-device-infiniband.h @@ -18,8 +18,8 @@ * Copyright 2011 Red Hat, Inc. */ -#ifndef NM_DEVICE_INFINIBAND_H -#define NM_DEVICE_INFINIBAND_H +#ifndef __NETWORKMANAGER_DEVICE_INFINIBAND_H__ +#define __NETWORKMANAGER_DEVICE_INFINIBAND_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-logging.h b/src/devices/nm-device-logging.h index b632d0f9f7..c6f4f99f1e 100644 --- a/src/devices/nm-device-logging.h +++ b/src/devices/nm-device-logging.h @@ -18,8 +18,8 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#ifndef NM_DEVICE_LOGGING_H -#define NM_DEVICE_LOGGING_H +#ifndef __NETWORKMANAGER_DEVICE_LOGGING_H__ +#define __NETWORKMANAGER_DEVICE_LOGGING_H__ #include "nm-logging.h" #include "nm-device.h" @@ -42,4 +42,4 @@ _nm_device_log_self_to_device (t *self) \ #define _LOGW(domain, ...) _LOG (LOGL_WARN, domain, __VA_ARGS__) #define _LOGE(domain, ...) _LOG (LOGL_ERR, domain, __VA_ARGS__) -#endif /* NM_DEVICE_LOGGING_H */ +#endif /* __NETWORKMANAGER_DEVICE_LOGGING_H__ */ diff --git a/src/devices/nm-device-macvlan.h b/src/devices/nm-device-macvlan.h index 348ed2f96f..1e350ce1b3 100644 --- a/src/devices/nm-device-macvlan.h +++ b/src/devices/nm-device-macvlan.h @@ -18,8 +18,8 @@ * Copyright 2013 Red Hat, Inc. */ -#ifndef NM_DEVICE_MACVLAN_H -#define NM_DEVICE_MACVLAN_H +#ifndef __NETWORKMANAGER_DEVICE_MACVLAN_H__ +#define __NETWORKMANAGER_DEVICE_MACVLAN_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h index bed89f7c39..21776d47aa 100644 --- a/src/devices/nm-device-private.h +++ b/src/devices/nm-device-private.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2011 Red Hat, Inc. */ -#ifndef NM_DEVICE_PRIVATE_H -#define NM_DEVICE_PRIVATE_H +#ifndef __NETWORKMANAGER_DEVICE_PRIVATE_H__ +#define __NETWORKMANAGER_DEVICE_PRIVATE_H__ #include "nm-device.h" diff --git a/src/devices/nm-device-tun.h b/src/devices/nm-device-tun.h index cfcf4d7be2..0ff1db1eca 100644 --- a/src/devices/nm-device-tun.h +++ b/src/devices/nm-device-tun.h @@ -18,8 +18,8 @@ * Copyright 2013 Red Hat, Inc. */ -#ifndef NM_DEVICE_TUN_H -#define NM_DEVICE_TUN_H +#ifndef __NETWORKMANAGER_DEVICE_TUN_H__ +#define __NETWORKMANAGER_DEVICE_TUN_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-veth.h b/src/devices/nm-device-veth.h index bc8fedffde..584ec8572c 100644 --- a/src/devices/nm-device-veth.h +++ b/src/devices/nm-device-veth.h @@ -18,8 +18,8 @@ * Copyright 2013 Red Hat, Inc. */ -#ifndef NM_DEVICE_VETH_H -#define NM_DEVICE_VETH_H +#ifndef __NETWORKMANAGER_DEVICE_VETH_H__ +#define __NETWORKMANAGER_DEVICE_VETH_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-vlan.h b/src/devices/nm-device-vlan.h index 0f2ac70d5f..b1d0ed9679 100644 --- a/src/devices/nm-device-vlan.h +++ b/src/devices/nm-device-vlan.h @@ -18,8 +18,8 @@ * Copyright 2012 Red Hat, Inc. */ -#ifndef NM_DEVICE_VLAN_H -#define NM_DEVICE_VLAN_H +#ifndef __NETWORKMANAGER_DEVICE_VLAN_H__ +#define __NETWORKMANAGER_DEVICE_VLAN_H__ #include <glib-object.h> diff --git a/src/devices/nm-device-vxlan.h b/src/devices/nm-device-vxlan.h index 14b158deda..0e08571066 100644 --- a/src/devices/nm-device-vxlan.h +++ b/src/devices/nm-device-vxlan.h @@ -18,8 +18,8 @@ * Copyright 2013, 2014 Red Hat, Inc. */ -#ifndef NM_DEVICE_VXLAN_H -#define NM_DEVICE_VXLAN_H +#ifndef __NETWORKMANAGER_DEVICE_VXLAN_H__ +#define __NETWORKMANAGER_DEVICE_VXLAN_H__ #include <glib-object.h> diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 17f68efdf5..e570803fa8 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -19,8 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#ifndef NM_DEVICE_H -#define NM_DEVICE_H +#ifndef __NETWORKMANAGER_DEVICE_H__ +#define __NETWORKMANAGER_DEVICE_H__ #include <glib-object.h> #include <dbus/dbus-glib.h> diff --git a/src/devices/team/nm-device-team.h b/src/devices/team/nm-device-team.h index fb2a184115..57f3aeffc8 100644 --- a/src/devices/team/nm-device-team.h +++ b/src/devices/team/nm-device-team.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef NM_DEVICE_TEAM_H -#define NM_DEVICE_TEAM_H +#ifndef __NETWORKMANAGER_DEVICE_TEAM_H__ +#define __NETWORKMANAGER_DEVICE_TEAM_H__ #include <glib-object.h> diff --git a/src/devices/team/nm-team-factory.h b/src/devices/team/nm-team-factory.h index f637371d77..2f02ac5729 100644 --- a/src/devices/team/nm-team-factory.h +++ b/src/devices/team/nm-team-factory.h @@ -18,8 +18,8 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#ifndef NM_TEAM_FACTORY_H -#define NM_TEAM_FACTORY_H +#ifndef __NETWORKMANAGER_TEAM_FACTORY_H__ +#define __NETWORKMANAGER_TEAM_FACTORY_H__ #include <glib-object.h> @@ -34,4 +34,4 @@ typedef struct { GObjectClass parent; } NMTeamFactoryClass; -#endif /* NM_TEAM_FACTORY_H */ +#endif /* __NETWORKMANAGER_TEAM_FACTORY_H__ */ diff --git a/src/devices/wifi/nm-device-olpc-mesh.h b/src/devices/wifi/nm-device-olpc-mesh.h index c25dd8e53c..c7f6f24ffc 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.h +++ b/src/devices/wifi/nm-device-olpc-mesh.h @@ -25,8 +25,8 @@ * (C) Copyright 2009 One Laptop per Child */ -#ifndef NM_DEVICE_OLPC_MESH_H -#define NM_DEVICE_OLPC_MESH_H +#ifndef __NETWORKMANAGER_DEVICE_OLPC_MESH_H__ +#define __NETWORKMANAGER_DEVICE_OLPC_MESH_H__ #include <glib-object.h> #include <dbus/dbus.h> diff --git a/src/devices/wifi/nm-device-wifi.h b/src/devices/wifi/nm-device-wifi.h index 117d5e7e15..3ae00ed176 100644 --- a/src/devices/wifi/nm-device-wifi.h +++ b/src/devices/wifi/nm-device-wifi.h @@ -19,8 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#ifndef NM_DEVICE_WIFI_H -#define NM_DEVICE_WIFI_H +#ifndef __NETWORKMANAGER_DEVICE_WIFI_H__ +#define __NETWORKMANAGER_DEVICE_WIFI_H__ #include <glib-object.h> #include <dbus/dbus.h> diff --git a/src/devices/wifi/nm-wifi-ap-utils.h b/src/devices/wifi/nm-wifi-ap-utils.h index cdb8db7d9c..d64d9dd53b 100644 --- a/src/devices/wifi/nm-wifi-ap-utils.h +++ b/src/devices/wifi/nm-wifi-ap-utils.h @@ -18,8 +18,8 @@ * (C) Copyright 2011 Red Hat, Inc. */ -#ifndef NM_WIFI_AP_UTILS_H -#define NM_WIFI_AP_UTILS_H +#ifndef __NETWORKMANAGER_WIFI_AP_UTILS_H__ +#define __NETWORKMANAGER_WIFI_AP_UTILS_H__ #include <nm-dbus-interface.h> diff --git a/src/devices/wifi/nm-wifi-ap.h b/src/devices/wifi/nm-wifi-ap.h index ac41dac2dd..c9175821b5 100644 --- a/src/devices/wifi/nm-wifi-ap.h +++ b/src/devices/wifi/nm-wifi-ap.h @@ -19,8 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#ifndef NM_ACCESS_POINT_H -#define NM_ACCESS_POINT_H +#ifndef __NETWORKMANAGER_ACCESS_POINT_H__ +#define __NETWORKMANAGER_ACCESS_POINT_H__ #include <glib.h> #include <glib-object.h> @@ -118,4 +118,4 @@ NMAccessPoint * nm_ap_match_in_list (NMAccessPoint *find_ap, void nm_ap_dump (NMAccessPoint *ap, const char *prefix); -#endif /* NM_ACCESS_POINT_H */ +#endif /* __NETWORKMANAGER_ACCESS_POINT_H__ */ diff --git a/src/devices/wimax/iwmxsdk.h b/src/devices/wimax/iwmxsdk.h index 785ca8c2fb..9a1b8196d1 100644 --- a/src/devices/wimax/iwmxsdk.h +++ b/src/devices/wimax/iwmxsdk.h @@ -19,8 +19,8 @@ * */ -#ifndef IWMXSDK_H -#define IWMXSDK_H +#ifndef __IWMXSDK_H__ +#define __IWMXSDK_H__ #include <wimax/WiMaxType.h> #include <wimax/WiMaxTypesEx.h> @@ -108,4 +108,4 @@ int iwmx_sdk_get_networks(struct wmxsdk *wmxsdk); int iwmx_sdk_api_init(void); void iwmx_sdk_api_exit(void); -#endif /* IWMXSDK_H */ +#endif /* __IWMXSDK_H__ */ diff --git a/src/devices/wimax/nm-device-wimax.h b/src/devices/wimax/nm-device-wimax.h index 0606a1999e..b70c3f88bb 100644 --- a/src/devices/wimax/nm-device-wimax.h +++ b/src/devices/wimax/nm-device-wimax.h @@ -19,8 +19,8 @@ * Copyright (C) 2009 Novell, Inc. */ -#ifndef NM_DEVICE_WIMAX_H -#define NM_DEVICE_WIMAX_H +#ifndef __NETWORKMANAGER_DEVICE_WIMAX_H__ +#define __NETWORKMANAGER_DEVICE_WIMAX_H__ #include "nm-device.h" #include "nm-wimax-nsp.h" diff --git a/src/devices/wimax/nm-wimax-nsp.h b/src/devices/wimax/nm-wimax-nsp.h index a74b68a79d..8d0a6a14b3 100644 --- a/src/devices/wimax/nm-wimax-nsp.h +++ b/src/devices/wimax/nm-wimax-nsp.h @@ -18,8 +18,8 @@ * Copyright (C) 2009 Novell, Inc. */ -#ifndef NM_WIMAX_NSP_H -#define NM_WIMAX_NSP_H +#ifndef __NETWORKMANAGER_WIMAX_NSP_H__ +#define __NETWORKMANAGER_WIMAX_NSP_H__ #include <glib-object.h> #include "nm-wimax-types.h" diff --git a/src/devices/wimax/nm-wimax-types.h b/src/devices/wimax/nm-wimax-types.h index 8c807fd8a4..207d2477ae 100644 --- a/src/devices/wimax/nm-wimax-types.h +++ b/src/devices/wimax/nm-wimax-types.h @@ -18,8 +18,8 @@ * Copyright (C) 2009 Novell, Inc. */ -#ifndef NM_WIMAX_TYPES_H -#define NM_WIMAX_TYPES_H +#ifndef __NETWORKMANAGER_WIMAX_TYPES_H__ +#define __NETWORKMANAGER_WIMAX_TYPES_H__ typedef enum { NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN, diff --git a/src/devices/wimax/nm-wimax-util.h b/src/devices/wimax/nm-wimax-util.h index 71f5aa29d2..d5ec0f04d7 100644 --- a/src/devices/wimax/nm-wimax-util.h +++ b/src/devices/wimax/nm-wimax-util.h @@ -18,8 +18,8 @@ * Copyright (C) 2009 Novell, Inc. */ -#ifndef NM_WIMAX_UTIL_H -#define NM_WIMAX_UTIL_H +#ifndef __NETWORKMANAGER_WIMAX_UTIL_H__ +#define __NETWORKMANAGER_WIMAX_UTIL_H__ #include <glib.h> diff --git a/src/devices/wwan/nm-device-modem.h b/src/devices/wwan/nm-device-modem.h index ee6b2988c4..996195c49e 100644 --- a/src/devices/wwan/nm-device-modem.h +++ b/src/devices/wwan/nm-device-modem.h @@ -18,8 +18,8 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#ifndef NM_DEVICE_MODEM_H -#define NM_DEVICE_MODEM_H +#ifndef __NETWORKMANAGER_DEVICE_MODEM_H__ +#define __NETWORKMANAGER_DEVICE_MODEM_H__ #include <glib.h> #include <glib-object.h> @@ -51,4 +51,4 @@ GType nm_device_modem_get_type (void); NMDevice *nm_device_modem_new (NMModem *modem); -#endif /* NM_DEVICE_MODEM_H */ +#endif /* __NETWORKMANAGER_DEVICE_MODEM_H__ */ diff --git a/src/devices/wwan/nm-modem-broadband.h b/src/devices/wwan/nm-modem-broadband.h index e12ca68caf..5fcba845fe 100644 --- a/src/devices/wwan/nm-modem-broadband.h +++ b/src/devices/wwan/nm-modem-broadband.h @@ -18,8 +18,8 @@ * Copyright (C) 2012 - Aleksander Morgado <aleksander@gnu.org> */ -#ifndef NM_MODEM_BROADBAND_H -#define NM_MODEM_BROADBAND_H +#ifndef __NETWORKMANAGER_MODEM_BROADBAND_H__ +#define __NETWORKMANAGER_MODEM_BROADBAND_H__ #include <dbus/dbus-glib.h> #include <glib-object.h> @@ -55,4 +55,4 @@ NMModem *nm_modem_broadband_new (GObject *object, GError **error); G_END_DECLS -#endif /* NM_MODEM_BROADBAND_H */ +#endif /* __NETWORKMANAGER_MODEM_BROADBAND_H__ */ diff --git a/src/devices/wwan/nm-modem-manager.h b/src/devices/wwan/nm-modem-manager.h index 3082bdb39f..9e0db41e3f 100644 --- a/src/devices/wwan/nm-modem-manager.h +++ b/src/devices/wwan/nm-modem-manager.h @@ -20,8 +20,8 @@ * Copyright (C) 2009 Canonical Ltd. */ -#ifndef NM_MODEM_MANAGER_H -#define NM_MODEM_MANAGER_H +#ifndef __NETWORKMANAGER_MODEM_MANAGER_H__ +#define __NETWORKMANAGER_MODEM_MANAGER_H__ #include <glib-object.h> #include "nm-modem.h" @@ -46,4 +46,4 @@ typedef struct { GType nm_modem_manager_get_type (void); -#endif /* NM_MODEM_MANAGER_H */ +#endif /* __NETWORKMANAGER_MODEM_MANAGER_H__ */ diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h index 776d3d7f39..81bd2283a7 100644 --- a/src/devices/wwan/nm-modem.h +++ b/src/devices/wwan/nm-modem.h @@ -19,8 +19,8 @@ * Copyright (C) 2009 Novell, Inc. */ -#ifndef NM_MODEM_H -#define NM_MODEM_H +#ifndef __NETWORKMANAGER_MODEM_H__ +#define __NETWORKMANAGER_MODEM_H__ #include <dbus/dbus-glib.h> #include <glib-object.h> @@ -261,4 +261,4 @@ void nm_modem_emit_ip6_config_result (NMModem *self, G_END_DECLS -#endif /* NM_MODEM_H */ +#endif /* __NETWORKMANAGER_MODEM_H__ */ diff --git a/src/devices/wwan/nm-wwan-factory.h b/src/devices/wwan/nm-wwan-factory.h index b7aee01f15..c6c03f1f09 100644 --- a/src/devices/wwan/nm-wwan-factory.h +++ b/src/devices/wwan/nm-wwan-factory.h @@ -18,8 +18,8 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#ifndef NM_WWAN_FACTORY_H -#define NM_WWAN_FACTORY_H +#ifndef __NETWORKMANAGER_WWAN_FACTORY_H__ +#define __NETWORKMANAGER_WWAN_FACTORY_H__ #include <glib-object.h> @@ -34,4 +34,4 @@ typedef struct { GObjectClass parent; } NMWwanFactoryClass; -#endif /* NM_WWAN_FACTORY_H */ +#endif /* __NETWORKMANAGER_WWAN_FACTORY_H__ */ diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp-manager/nm-dhcp-client.h index a36ba67b69..f458b13ff8 100644 --- a/src/dhcp-manager/nm-dhcp-client.h +++ b/src/dhcp-manager/nm-dhcp-client.h @@ -16,8 +16,8 @@ * Copyright (C) 2005 - 2010 Red Hat, Inc. */ -#ifndef NM_DHCP_CLIENT_H -#define NM_DHCP_CLIENT_H +#ifndef __NETWORKMANAGER_DHCP_CLIENT_H__ +#define __NETWORKMANAGER_DHCP_CLIENT_H__ #include <glib.h> #include <glib-object.h> @@ -144,5 +144,5 @@ void nm_dhcp_client_set_state (NMDhcpClient *self, GObject *ip_config, /* NMIP4Config or NMIP6Config */ GHashTable *options); /* str:str hash */ -#endif /* NM_DHCP_CLIENT_H */ +#endif /* __NETWORKMANAGER_DHCP_CLIENT_H__ */ diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.h b/src/dhcp-manager/nm-dhcp-dhclient-utils.h index e8d91b3147..61da24877d 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient-utils.h +++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.h @@ -16,8 +16,8 @@ * Copyright (C) 2010 Red Hat, Inc. */ -#ifndef NM_DHCP_DHCLIENT_UTILS_H -#define NM_DHCP_DHCLIENT_UTILS_H +#ifndef __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__ +#define __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__ #include <glib.h> #include <glib-object.h> @@ -48,5 +48,5 @@ GSList *nm_dhcp_dhclient_read_lease_ip_configs (const char *iface, gboolean ipv6, GDateTime *now); -#endif /* NM_DHCP_DHCLIENT_UTILS_H */ +#endif /* __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__ */ diff --git a/src/dhcp-manager/nm-dhcp-dhclient.h b/src/dhcp-manager/nm-dhcp-dhclient.h index 592109c660..8192a599b1 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.h +++ b/src/dhcp-manager/nm-dhcp-dhclient.h @@ -16,8 +16,8 @@ * Copyright (C) 2005 - 2010 Red Hat, Inc. */ -#ifndef NM_DHCP_DHCLIENT_H -#define NM_DHCP_DHCLIENT_H +#ifndef __NETWORKMANAGER_DHCP_DHCLIENT_H__ +#define __NETWORKMANAGER_DHCP_DHCLIENT_H__ #include <glib.h> #include <glib-object.h> @@ -47,5 +47,5 @@ GSList *nm_dhcp_dhclient_get_lease_ip_configs (const char *iface, const char *nm_dhcp_dhclient_get_path (const char *try_first); -#endif /* NM_DHCP_DHCLIENT_H */ +#endif /* __NETWORKMANAGER_DHCP_DHCLIENT_H__ */ diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.h b/src/dhcp-manager/nm-dhcp-dhcpcd.h index 51380eb662..6dfe0dda97 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.h +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.h @@ -16,8 +16,8 @@ * Copyright (C) 2005 - 2010 Red Hat, Inc. */ -#ifndef NM_DHCP_DHCPCD_H -#define NM_DHCP_DHCPCD_H +#ifndef __NETWORKMANAGER_DHCP_DHCPCD_H__ +#define __NETWORKMANAGER_DHCP_DHCPCD_H__ #include <glib.h> #include <glib-object.h> @@ -43,5 +43,5 @@ GType nm_dhcp_dhcpcd_get_type (void); const char *nm_dhcp_dhcpcd_get_path (const char *try_first); -#endif /* NM_DHCP_DHCPCD_H */ +#endif /* __NETWORKMANAGER_DHCP_DHCPCD_H__ */ diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index 9c197b5432..23b1fa10f6 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -19,8 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#ifndef NM_DHCP_MANAGER_H -#define NM_DHCP_MANAGER_H +#ifndef __NETWORKMANAGER_DHCP_MANAGER_H__ +#define __NETWORKMANAGER_DHCP_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -93,4 +93,4 @@ GSList * nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self, /* For testing only */ extern const char* nm_dhcp_helper_path; -#endif /* NM_DHCP_MANAGER_H */ +#endif /* __NETWORKMANAGER_DHCP_MANAGER_H__ */ diff --git a/src/dhcp-manager/nm-dhcp-utils.h b/src/dhcp-manager/nm-dhcp-utils.h index be6b28106a..ab9d45fe4b 100644 --- a/src/dhcp-manager/nm-dhcp-utils.h +++ b/src/dhcp-manager/nm-dhcp-utils.h @@ -16,8 +16,8 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#ifndef NM_DHCP_UTILS_H -#define NM_DHCP_UTILS_H +#ifndef __NETWORKMANAGER_DHCP_UTILS_H__ +#define __NETWORKMANAGER_DHCP_UTILS_H__ #include <stdlib.h> #include <glib.h> @@ -35,5 +35,5 @@ NMIP6Config *nm_dhcp_utils_ip6_config_from_options (const char *iface, char * nm_dhcp_utils_duid_to_string (const GByteArray *duid); -#endif /* NM_DHCP_UTILS_H */ +#endif /* __NETWORKMANAGER_DHCP_UTILS_H__ */ diff --git a/src/dns-manager/nm-dns-dnsmasq.h b/src/dns-manager/nm-dns-dnsmasq.h index 70933c0f12..fc80f07940 100644 --- a/src/dns-manager/nm-dns-dnsmasq.h +++ b/src/dns-manager/nm-dns-dnsmasq.h @@ -16,8 +16,8 @@ * Copyright (C) 2010 Red Hat, Inc. */ -#ifndef NM_DNS_DNSMASQ_H -#define NM_DNS_DNSMASQ_H +#ifndef __NETWORKMANAGER_DNS_DNSMASQ_H__ +#define __NETWORKMANAGER_DNS_DNSMASQ_H__ #include <glib.h> #include <glib-object.h> @@ -43,5 +43,5 @@ GType nm_dns_dnsmasq_get_type (void); NMDnsPlugin *nm_dns_dnsmasq_new (void); -#endif /* NM_DNS_DNSMASQ_H */ +#endif /* __NETWORKMANAGER_DNS_DNSMASQ_H__ */ diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h index b2bf2467c2..238d924a8c 100644 --- a/src/dns-manager/nm-dns-manager.h +++ b/src/dns-manager/nm-dns-manager.h @@ -21,8 +21,8 @@ * and others */ -#ifndef NM_DNS_MANAGER_H -#define NM_DNS_MANAGER_H +#ifndef __NETWORKMANAGER_DNS_MANAGER_H__ +#define __NETWORKMANAGER_DNS_MANAGER_H__ #include <glib-object.h> #include <dbus/dbus.h> @@ -114,4 +114,4 @@ NMDnsManagerResolvConfMode nm_dns_manager_get_resolv_conf_mode (NMDnsManager *mg G_END_DECLS -#endif /* NM_DNS_MANAGER_H */ +#endif /* __NETWORKMANAGER_DNS_MANAGER_H__ */ diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h index 41a12a58e3..ee735a5abf 100644 --- a/src/dns-manager/nm-dns-plugin.h +++ b/src/dns-manager/nm-dns-plugin.h @@ -16,8 +16,8 @@ * Copyright (C) 2010 Red Hat, Inc. */ -#ifndef NM_DNS_PLUGIN_H -#define NM_DNS_PLUGIN_H +#ifndef __NETWORKMANAGER_DNS_PLUGIN_H__ +#define __NETWORKMANAGER_DNS_PLUGIN_H__ #include <glib.h> #include <glib-object.h> @@ -109,5 +109,5 @@ GPid nm_dns_plugin_child_spawn (NMDnsPlugin *self, gboolean nm_dns_plugin_child_kill (NMDnsPlugin *self); -#endif /* NM_DNS_PLUGIN_H */ +#endif /* __NETWORKMANAGER_DNS_PLUGIN_H__ */ diff --git a/src/dns-manager/nm-dns-unbound.h b/src/dns-manager/nm-dns-unbound.h index 2aaae7dd4b..261326b2d4 100644 --- a/src/dns-manager/nm-dns-unbound.h +++ b/src/dns-manager/nm-dns-unbound.h @@ -15,8 +15,8 @@ * * Copyright (C) 2014 Red Hat, Inc. */ -#ifndef NM_DNS_UNBOUND_H -#define NM_DNS_UNBOUND_H +#ifndef __NETWORKMANAGER_DNS_UNBOUND_H__ +#define __NETWORKMANAGER_DNS_UNBOUND_H__ #include <glib-object.h> @@ -41,4 +41,4 @@ GType nm_dns_unbound_get_type (void); NMDnsPlugin *nm_dns_unbound_new (void); -#endif /* NM_DNS_UNBOUND_H */ +#endif /* __NETWORKMANAGER_DNS_UNBOUND_H__ */ diff --git a/src/dns-manager/nm-dns-utils.h b/src/dns-manager/nm-dns-utils.h index daa6711cce..75c6b0608f 100644 --- a/src/dns-manager/nm-dns-utils.h +++ b/src/dns-manager/nm-dns-utils.h @@ -17,8 +17,8 @@ * */ -#ifndef NM_DNS_UTILS_H -#define NM_DNS_UTILS_H +#ifndef __NETWORKMANAGER_DNS_UTILS_H__ +#define __NETWORKMANAGER_DNS_UTILS_H__ #include "nm-ip4-config.h" diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.h b/src/dnsmasq-manager/nm-dnsmasq-manager.h index e98a6adb58..c6afcd7cb0 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.h +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h @@ -18,8 +18,8 @@ * Copyright (C) 2008 Red Hat, Inc. */ -#ifndef NM_DNSMASQ_MANAGER_H -#define NM_DNSMASQ_MANAGER_H +#ifndef __NETWORKMANAGER_DNSMASQ_MANAGER_H__ +#define __NETWORKMANAGER_DNSMASQ_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -66,4 +66,4 @@ void nm_dnsmasq_manager_stop (NMDnsMasqManager *manager); GQuark nm_dnsmasq_manager_error_quark (void); -#endif /* NM_DNSMASQ_MANAGER_H */ +#endif /* __NETWORKMANAGER_DNSMASQ_MANAGER_H__ */ diff --git a/src/dnsmasq-manager/nm-dnsmasq-utils.h b/src/dnsmasq-manager/nm-dnsmasq-utils.h index 4534c6ef24..bb468c824b 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-utils.h +++ b/src/dnsmasq-manager/nm-dnsmasq-utils.h @@ -18,8 +18,8 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#ifndef NM_DNSMASQ_UTILS_H -#define NM_DNSMASQ_UTILS_H +#ifndef __NETWORKMANAGER_DNSMASQ_UTILS_H__ +#define __NETWORKMANAGER_DNSMASQ_UTILS_H__ #include <glib.h> #include "nm-platform.h" @@ -29,4 +29,4 @@ gboolean nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr, char *out_last, char **out_error_desc); -#endif /* NM_DNSMASQ_UTILS_H */ +#endif /* __NETWORKMANAGER_DNSMASQ_UTILS_H__ */ diff --git a/src/firewall-manager/nm-firewall-manager.h b/src/firewall-manager/nm-firewall-manager.h index a77984e375..cf527fd97f 100644 --- a/src/firewall-manager/nm-firewall-manager.h +++ b/src/firewall-manager/nm-firewall-manager.h @@ -18,8 +18,8 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#ifndef NM_FIREWALL_MANAGER_H -#define NM_FIREWALL_MANAGER_H +#ifndef __NETWORKMANAGER_FIREWALL_MANAGER_H__ +#define __NETWORKMANAGER_FIREWALL_MANAGER_H__ #include <glib-object.h> #include <dbus/dbus-glib.h> @@ -70,4 +70,4 @@ gpointer nm_firewall_manager_remove_from_zone (NMFirewallManager *mgr, void nm_firewall_manager_cancel_call (NMFirewallManager *mgr, gpointer fw_call); -#endif /* NM_FIREWALL_MANAGER_H */ +#endif /* __NETWORKMANAGER_FIREWALL_MANAGER_H__ */ diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h index 0229d81ad0..69756069ac 100644 --- a/src/nm-activation-request.h +++ b/src/nm-activation-request.h @@ -18,8 +18,8 @@ * (C) Copyright 2005 - 2012 Red Hat, Inc. */ -#ifndef NM_ACTIVATION_REQUEST_H -#define NM_ACTIVATION_REQUEST_H +#ifndef __NETWORKMANAGER_ACTIVATION_REQUEST_H__ +#define __NETWORKMANAGER_ACTIVATION_REQUEST_H__ #include <glib.h> #include <glib-object.h> @@ -78,5 +78,5 @@ guint32 nm_act_request_get_secrets (NMActRequest *req, void nm_act_request_cancel_secrets (NMActRequest *req, guint32 call_id); -#endif /* NM_ACTIVATION_REQUEST_H */ +#endif /* __NETWORKMANAGER_ACTIVATION_REQUEST_H__ */ diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h index 2609ed9ddf..9a6a54711c 100644 --- a/src/nm-active-connection.h +++ b/src/nm-active-connection.h @@ -18,8 +18,8 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#ifndef NM_ACTIVE_CONNECTION_H -#define NM_ACTIVE_CONNECTION_H +#ifndef __NETWORKMANAGER_ACTIVE_CONNECTION_H__ +#define __NETWORKMANAGER_ACTIVE_CONNECTION_H__ #include <glib-object.h> #include "nm-types.h" @@ -141,4 +141,4 @@ void nm_active_connection_set_assumed (NMActiveConnection *self, gboolean nm_active_connection_get_assumed (NMActiveConnection *self); -#endif /* NM_ACTIVE_CONNECTION_H */ +#endif /* __NETWORKMANAGER_ACTIVE_CONNECTION_H__ */ diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h index 41dc3f439b..4834005e2e 100644 --- a/src/nm-auth-subject.h +++ b/src/nm-auth-subject.h @@ -18,8 +18,8 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#ifndef NM_AUTH_SUBJECT_H -#define NM_AUTH_SUBJECT_H +#ifndef __NETWORKMANAGER_AUTH_SUBJECT_H__ +#define __NETWORKMANAGER_AUTH_SUBJECT_H__ #include <config.h> #include <glib.h> @@ -69,4 +69,4 @@ gboolean nm_auth_subject_get_internal (NMAuthSubject *subject); PolkitSubject *nm_auth_subject_get_polkit_subject (NMAuthSubject *subject); #endif -#endif /* NM_AUTH_SUBJECT_H */ +#endif /* __NETWORKMANAGER_AUTH_SUBJECT_H__ */ diff --git a/src/nm-config.h b/src/nm-config.h index fd243f4cc1..8f4fa1f7af 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -19,8 +19,8 @@ * Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de> */ -#ifndef NM_CONFIG_H -#define NM_CONFIG_H +#ifndef __NETWORKMANAGER_CONFIG_H__ +#define __NETWORKMANAGER_CONFIG_H__ #include <glib.h> #include <glib-object.h> @@ -74,5 +74,5 @@ NMConfig *nm_config_new (GError **error); G_END_DECLS -#endif /* NM_CONFIG_H */ +#endif /* __NETWORKMANAGER_CONFIG_H__ */ diff --git a/src/nm-connection-provider.h b/src/nm-connection-provider.h index 62f3295e33..8d5f7a696d 100644 --- a/src/nm-connection-provider.h +++ b/src/nm-connection-provider.h @@ -13,8 +13,8 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#ifndef NM_CONNECTION_PROVIDER_H -#define NM_CONNECTION_PROVIDER_H +#ifndef __NETWORKMANAGER_CONNECTION_PROVIDER_H__ +#define __NETWORKMANAGER_CONNECTION_PROVIDER_H__ #include <glib-object.h> #include <nm-connection.h> @@ -133,4 +133,4 @@ NMConnection *nm_connection_provider_add_connection (NMConnectionProvider *self, NMConnection *nm_connection_provider_get_connection_by_uuid (NMConnectionProvider *self, const char *uuid); -#endif /* NM_CONNECTION_PROVIDER_H */ +#endif /* __NETWORKMANAGER_CONNECTION_PROVIDER_H__ */ diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h index a471fd10c7..771abdc237 100644 --- a/src/nm-connectivity.h +++ b/src/nm-connectivity.h @@ -18,8 +18,8 @@ * Copyright (C) 2011 Thomas Bechtold <thomasbechtold@jpberlin.de> */ -#ifndef NM_CONNECTIVITY_H -#define NM_CONNECTIVITY_H +#ifndef __NETWORKMANAGER_CONNECTIVITY_H__ +#define __NETWORKMANAGER_CONNECTIVITY_H__ #include <glib.h> #include <glib-object.h> @@ -65,4 +65,4 @@ NMConnectivityState nm_connectivity_check_finish (NMConnectivity *self, GAsyncResult *result, GError **error); -#endif /* NM_CONNECTIVITY_H */ +#endif /* __NETWORKMANAGER_CONNECTIVITY_H__ */ diff --git a/src/nm-dcb.h b/src/nm-dcb.h index bfe5cedffb..7c56d653af 100644 --- a/src/nm-dcb.h +++ b/src/nm-dcb.h @@ -18,8 +18,8 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#ifndef NM_DCB_H -#define NM_DCB_H +#ifndef __NETWORKMANAGER_DCB_H__ +#define __NETWORKMANAGER_DCB_H__ #include <glib.h> #include "nm-setting-dcb.h" @@ -97,4 +97,4 @@ gboolean _fcoe_cleanup (const char *iface, gpointer user_data, GError **error); -#endif /* NM_DCB_H */ +#endif /* __NETWORKMANAGER_DCB_H__ */ diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp4-config.h index bdaa7edcfa..227d44817b 100644 --- a/src/nm-dhcp4-config.h +++ b/src/nm-dhcp4-config.h @@ -18,8 +18,8 @@ * Copyright (C) 2008 Red Hat, Inc. */ -#ifndef NM_DHCP4_CONFIG_H -#define NM_DHCP4_CONFIG_H +#ifndef __NETWORKMANAGER_DHCP4_CONFIG_H__ +#define __NETWORKMANAGER_DHCP4_CONFIG_H__ #include <glib.h> #include <glib-object.h> @@ -60,4 +60,4 @@ const char *nm_dhcp4_config_get_option (NMDhcp4Config *config, const char *optio GSList *nm_dhcp4_config_list_options (NMDhcp4Config *config); -#endif /* NM_DHCP4_CONFIG_H */ +#endif /* __NETWORKMANAGER_DHCP4_CONFIG_H__ */ diff --git a/src/nm-dhcp6-config.h b/src/nm-dhcp6-config.h index e577d3d3d8..eaca61b1ce 100644 --- a/src/nm-dhcp6-config.h +++ b/src/nm-dhcp6-config.h @@ -18,8 +18,8 @@ * Copyright (C) 2008 Red Hat, Inc. */ -#ifndef NM_DHCP6_CONFIG_H -#define NM_DHCP6_CONFIG_H +#ifndef __NETWORKMANAGER_DHCP6_CONFIG_H__ +#define __NETWORKMANAGER_DHCP6_CONFIG_H__ #include <glib.h> #include <glib-object.h> @@ -60,4 +60,4 @@ const char *nm_dhcp6_config_get_option (NMDhcp6Config *config, const char *optio GSList *nm_dhcp6_config_list_options (NMDhcp6Config *self); -#endif /* NM_DHCP6_CONFIG_H */ +#endif /* __NETWORKMANAGER_DHCP6_CONFIG_H__ */ diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h index 4a5b1df1d9..e93816b6b7 100644 --- a/src/nm-dispatcher.h +++ b/src/nm-dispatcher.h @@ -19,8 +19,8 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#ifndef NM_DISPATCHER_H -#define NM_DISPATCHER_H +#ifndef __NETWORKMANAGER_DISPATCHER_H__ +#define __NETWORKMANAGER_DISPATCHER_H__ #include <glib.h> #include <stdio.h> @@ -76,4 +76,4 @@ void nm_dispatcher_call_cancel (guint call_id); void nm_dispatcher_init (void); -#endif /* NM_DISPATCHER_H */ +#endif /* __NETWORKMANAGER_DISPATCHER_H__ */ diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 8a8993fd35..6b88228bbe 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -18,8 +18,8 @@ * Copyright (C) 2008–2013 Red Hat, Inc. */ -#ifndef NM_IP4_CONFIG_H -#define NM_IP4_CONFIG_H +#ifndef __NETWORKMANAGER_IP4_CONFIG_H__ +#define __NETWORKMANAGER_IP4_CONFIG_H__ #include <glib-object.h> @@ -146,4 +146,4 @@ gboolean nm_ip4_config_equal (const NMIP4Config *a, const NMIP4Config *b); gboolean nm_ip4_config_capture_resolv_conf (GArray *nameservers, const char *rc_contents); -#endif /* NM_IP4_CONFIG_H */ +#endif /* __NETWORKMANAGER_IP4_CONFIG_H__ */ diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index 143ebab026..f9c0cac02e 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -18,8 +18,8 @@ * Copyright (C) 2008–2013 Red Hat, Inc. */ -#ifndef NM_IP6_CONFIG_H -#define NM_IP6_CONFIG_H +#ifndef __NETWORKMANAGER_IP6_CONFIG_H__ +#define __NETWORKMANAGER_IP6_CONFIG_H__ #include <glib-object.h> @@ -127,4 +127,4 @@ gboolean nm_ip6_config_equal (const NMIP6Config *a, const NMIP6Config *b); gboolean nm_ip6_config_capture_resolv_conf (GArray *nameservers, const char *rc_contents); -#endif /* NM_IP6_CONFIG_H */ +#endif /* __NETWORKMANAGER_IP6_CONFIG_H__ */ diff --git a/src/nm-logging.h b/src/nm-logging.h index fdbed088d6..2158ec0672 100644 --- a/src/nm-logging.h +++ b/src/nm-logging.h @@ -19,8 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#ifndef NM_LOGGING_H -#define NM_LOGGING_H +#ifndef __NETWORKMANAGER_LOGGING_H__ +#define __NETWORKMANAGER_LOGGING_H__ #ifdef __NM_TEST_UTILS_H__ #error nm-test-utils.h must be included as last header @@ -154,4 +154,4 @@ gboolean nm_logging_setup (const char *level, void nm_logging_syslog_openlog (gboolean debug); void nm_logging_syslog_closelog (void); -#endif /* NM_LOGGING_H */ +#endif /* __NETWORKMANAGER_LOGGING_H__ */ diff --git a/src/nm-manager-auth.h b/src/nm-manager-auth.h index 8fb629bbc1..25f3cd591e 100644 --- a/src/nm-manager-auth.h +++ b/src/nm-manager-auth.h @@ -18,8 +18,8 @@ * Copyright (C) 2010 Red Hat, Inc. */ -#ifndef NM_MANAGER_AUTH_H -#define NM_MANAGER_AUTH_H +#ifndef __NETWORKMANAGER_MANAGER_AUTH_H__ +#define __NETWORKMANAGER_MANAGER_AUTH_H__ #include <glib.h> #include <dbus/dbus-glib.h> @@ -102,5 +102,5 @@ void nm_auth_changed_func_register (GDestroyNotify callback, gpointer callback_d void nm_auth_changed_func_unregister (GDestroyNotify callback, gpointer callback_data); -#endif /* NM_MANAGER_AUTH_H */ +#endif /* __NETWORKMANAGER_MANAGER_AUTH_H__ */ diff --git a/src/nm-manager.h b/src/nm-manager.h index 40c61b2f23..08780a3811 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2010 Red Hat, Inc. */ -#ifndef NM_MANAGER_H -#define NM_MANAGER_H +#ifndef __NETWORKMANAGER_MANAGER_H__ +#define __NETWORKMANAGER_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -134,4 +134,4 @@ gboolean nm_manager_deactivate_connection (NMManager *manager, NMState nm_manager_get_state (NMManager *manager); -#endif /* NM_MANAGER_H */ +#endif /* __NETWORKMANAGER_MANAGER_H__ */ diff --git a/src/nm-policy.h b/src/nm-policy.h index 141799a873..76653529ea 100644 --- a/src/nm-policy.h +++ b/src/nm-policy.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#ifndef NM_POLICY_H -#define NM_POLICY_H +#ifndef __NETWORKMANAGER_POLICY_H__ +#define __NETWORKMANAGER_POLICY_H__ #include "nm-types.h" @@ -54,4 +54,4 @@ NMDevice *nm_policy_get_default_ip6_device (NMPolicy *policy); NMDevice *nm_policy_get_activating_ip4_device (NMPolicy *policy); NMDevice *nm_policy_get_activating_ip6_device (NMPolicy *policy); -#endif /* NM_POLICY_H */ +#endif /* __NETWORKMANAGER_POLICY_H__ */ diff --git a/src/nm-posix-signals.h b/src/nm-posix-signals.h index 81be5e1c4f..e2af559bab 100644 --- a/src/nm-posix-signals.h +++ b/src/nm-posix-signals.h @@ -18,8 +18,8 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#ifndef NM_POSIX_SIGNALS_H -#define NM_POSIX_SIGNALS_H +#ifndef __NETWORKMANAGER_POSIX_SIGNALS_H__ +#define __NETWORKMANAGER_POSIX_SIGNALS_H__ #include <glib.h> #include <signal.h> @@ -33,4 +33,4 @@ void nm_unblock_posix_signals (gpointer user_data); void nm_save_original_signal_mask (sigset_t sig_mask); const sigset_t *nm_get_original_signal_mask (void); -#endif /* NM_POSIX_SIGNALS_H */ +#endif /* __NETWORKMANAGER_POSIX_SIGNALS_H__ */ diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h index a507421855..220f3c2c6f 100644 --- a/src/nm-rfkill-manager.h +++ b/src/nm-rfkill-manager.h @@ -23,8 +23,8 @@ #include "nm-types.h" -#ifndef NM_RFKILL_MANAGER_H -#define NM_RFKILL_MANAGER_H +#ifndef __NETWORKMANAGER_RFKILL_MANAGER_H__ +#define __NETWORKMANAGER_RFKILL_MANAGER_H__ typedef enum { RFKILL_UNBLOCKED = 0, diff --git a/src/nm-session-monitor.h b/src/nm-session-monitor.h index ed168248e0..3efe6eca6b 100644 --- a/src/nm-session-monitor.h +++ b/src/nm-session-monitor.h @@ -18,8 +18,8 @@ * Author: Dan Williams <dcbw@redhat.com> */ -#ifndef NM_SESSION_MONITOR_H -#define NM_SESSION_MONITOR_H +#ifndef __NETWORKMANAGER_SESSION_MONITOR_H__ +#define __NETWORKMANAGER_SESSION_MONITOR_H__ #include <glib-object.h> @@ -61,5 +61,5 @@ gboolean nm_session_monitor_uid_active (NMSessionMonitor *monitor G_END_DECLS -#endif /* NM_SESSION_MONITOR_H */ +#endif /* __NETWORKMANAGER_SESSION_MONITOR_H__ */ diff --git a/src/nm-session-utils.h b/src/nm-session-utils.h index 54b6d4c43a..1608c222da 100644 --- a/src/nm-session-utils.h +++ b/src/nm-session-utils.h @@ -17,8 +17,8 @@ * Author: Dan Williams <dcbw@redhat.com> */ -#ifndef NM_SESSION_UTILS_H -#define NM_SESSION_UTILS_H +#ifndef __NETWORKMANAGER_SESSION_UTILS_H__ +#define __NETWORKMANAGER_SESSION_UTILS_H__ #include <glib.h> #include <glib-object.h> diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h index 00eeaa03af..84623771a9 100644 --- a/src/nm-sleep-monitor.h +++ b/src/nm-sleep-monitor.h @@ -17,8 +17,8 @@ * Author: Matthias Clasen <mclasen@redhat.com> */ -#ifndef NM_SLEEP_MONITOR_H -#define NM_SLEEP_MONITOR_H +#ifndef __NETWORKMANAGER_SLEEP_MONITOR_H__ +#define __NETWORKMANAGER_SLEEP_MONITOR_H__ #include <glib-object.h> @@ -43,5 +43,5 @@ NMSleepMonitor *nm_sleep_monitor_get (void); G_END_DECLS -#endif /* NM_SLEEP_MONITOR_H */ +#endif /* __NETWORKMANAGER_SLEEP_MONITOR_H__ */ diff --git a/src/nm-types.h b/src/nm-types.h index e902e30175..2acc25c0bd 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -18,8 +18,8 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#ifndef NM_TYPES_H -#define NM_TYPES_H +#ifndef __NETWORKMANAGER_TYPES_H__ +#define __NETWORKMANAGER_TYPES_H__ /* core */ typedef struct _NMActiveConnection NMActiveConnection; diff --git a/src/platform/nm-fake-platform.h b/src/platform/nm-fake-platform.h index c9fa42eb6e..53a2ff1a6a 100644 --- a/src/platform/nm-fake-platform.h +++ b/src/platform/nm-fake-platform.h @@ -18,8 +18,8 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#ifndef NM_FAKE_PLATFORM_H -#define NM_FAKE_PLATFORM_H +#ifndef __NETWORKMANAGER_FAKE_PLATFORM_H__ +#define __NETWORKMANAGER_FAKE_PLATFORM_H__ #include "nm-platform.h" @@ -46,4 +46,4 @@ GType nm_fake_platform_get_type (void); void nm_fake_platform_setup (void); -#endif /* NM_FAKE_PLATFORM_H */ +#endif /* __NETWORKMANAGER_FAKE_PLATFORM_H__ */ diff --git a/src/platform/nm-linux-platform.h b/src/platform/nm-linux-platform.h index 53ea75e692..6f2c199391 100644 --- a/src/platform/nm-linux-platform.h +++ b/src/platform/nm-linux-platform.h @@ -18,8 +18,8 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#ifndef NM_LINUX_PLATFORM_H -#define NM_LINUX_PLATFORM_H +#ifndef __NETWORKMANAGER_LINUX_PLATFORM_H__ +#define __NETWORKMANAGER_LINUX_PLATFORM_H__ #include "nm-platform.h" @@ -46,4 +46,4 @@ GType nm_linux_platform_get_type (void); void nm_linux_platform_setup (void); -#endif /* NM_LINUX_PLATFORM_H */ +#endif /* __NETWORKMANAGER_LINUX_PLATFORM_H__ */ diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index 8ad32d499f..8bcc30ec89 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -18,8 +18,8 @@ * Copyright (C) 2009 - 2010 Red Hat, Inc. */ -#ifndef NM_PLATFORM_H -#define NM_PLATFORM_H +#ifndef __NETWORKMANAGER_PLATFORM_H__ +#define __NETWORKMANAGER_PLATFORM_H__ #include <glib-object.h> #include "nm-glib-compat.h" @@ -628,4 +628,4 @@ void nm_platform_addr_flags2str (int flags, char *buf, size_t size); int nm_platform_ip_address_cmp_expiry (const NMPlatformIPAddress *a, const NMPlatformIPAddress *b); -#endif /* NM_PLATFORM_H */ +#endif /* __NETWORKMANAGER_PLATFORM_H__ */ diff --git a/src/platform/wifi/wifi-utils-nl80211.h b/src/platform/wifi/wifi-utils-nl80211.h index 2a7fe874a2..f34e960de3 100644 --- a/src/platform/wifi/wifi-utils-nl80211.h +++ b/src/platform/wifi/wifi-utils-nl80211.h @@ -18,8 +18,8 @@ * Copyright (C) 2011 Intel Corporation. All rights reserved. */ -#ifndef WIFI_UTILS_NL80211_H -#define WIFI_UTILS_NL80211_H +#ifndef __WIFI_UTILS_NL80211_H__ +#define __WIFI_UTILS_NL80211_H__ #include "wifi-utils.h" @@ -27,4 +27,4 @@ WifiData *wifi_nl80211_init (const char *iface, int ifindex); gboolean wifi_nl80211_is_wifi (const char *iface); -#endif /* WIFI_UTILS_NL80211_H */ +#endif /* __WIFI_UTILS_NL80211_H__ */ diff --git a/src/platform/wifi/wifi-utils-private.h b/src/platform/wifi/wifi-utils-private.h index 47c2386d23..91417fe7ea 100644 --- a/src/platform/wifi/wifi-utils-private.h +++ b/src/platform/wifi/wifi-utils-private.h @@ -18,8 +18,8 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#ifndef WIFI_UTILS_PRIVATE_H -#define WIFI_UTILS_PRIVATE_H +#ifndef __WIFI_UTILS_PRIVATE_H__ +#define __WIFI_UTILS_PRIVATE_H__ #include <glib.h> @@ -74,4 +74,4 @@ struct WifiData { gpointer wifi_data_new (const char *iface, int ifindex, gsize len); void wifi_data_free (WifiData *data); -#endif /* WIFI_UTILS_PRIVATE_H */ +#endif /* __WIFI_UTILS_PRIVATE_H__ */ diff --git a/src/platform/wifi/wifi-utils-wext.h b/src/platform/wifi/wifi-utils-wext.h index 96ad74eb40..e168fe28ad 100644 --- a/src/platform/wifi/wifi-utils-wext.h +++ b/src/platform/wifi/wifi-utils-wext.h @@ -18,8 +18,8 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#ifndef WIFI_UTILS_WEXT_H -#define WIFI_UTILS_WEXT_H +#ifndef __WIFI_UTILS_WEXT_H__ +#define __WIFI_UTILS_WEXT_H__ #include "wifi-utils.h" @@ -27,4 +27,4 @@ WifiData *wifi_wext_init (const char *iface, int ifindex, gboolean check_scan); gboolean wifi_wext_is_wifi (const char *iface); -#endif /* WIFI_UTILS_WEXT_H */ +#endif /* __WIFI_UTILS_WEXT_H__ */ diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h index e6fa39fcaf..a08ed8a2bb 100644 --- a/src/platform/wifi/wifi-utils.h +++ b/src/platform/wifi/wifi-utils.h @@ -19,8 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#ifndef WIFI_UTILS_H -#define WIFI_UTILS_H +#ifndef __WIFI_UTILS_H__ +#define __WIFI_UTILS_H__ #include <net/ethernet.h> #include <glib.h> @@ -73,4 +73,4 @@ gboolean wifi_utils_set_mesh_channel (WifiData *data, guint32 channel); gboolean wifi_utils_set_mesh_ssid (WifiData *data, const GByteArray *ssid); -#endif /* WIFI_UTILS_H */ +#endif /* __WIFI_UTILS_H__ */ diff --git a/src/ppp-manager/nm-ppp-manager.h b/src/ppp-manager/nm-ppp-manager.h index 7b0125b413..e074534e41 100644 --- a/src/ppp-manager/nm-ppp-manager.h +++ b/src/ppp-manager/nm-ppp-manager.h @@ -19,8 +19,8 @@ * Copyright (C) 2008 - 2010 Red Hat, Inc. */ -#ifndef NM_PPP_MANAGER_H -#define NM_PPP_MANAGER_H +#ifndef __NETWORKMANAGER_PPP_MANAGER_H__ +#define __NETWORKMANAGER_PPP_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -75,4 +75,4 @@ gboolean nm_ppp_manager_start (NMPPPManager *manager, GQuark nm_ppp_manager_error_quark (void); -#endif /* NM_PPP_MANAGER_H */ +#endif /* __NETWORKMANAGER_PPP_MANAGER_H__ */ diff --git a/src/ppp-manager/nm-ppp-status.h b/src/ppp-manager/nm-ppp-status.h index cfc7c393b7..391b5aa986 100644 --- a/src/ppp-manager/nm-ppp-status.h +++ b/src/ppp-manager/nm-ppp-status.h @@ -19,8 +19,8 @@ * Copyright (C) 2008 Red Hat, Inc. */ -#ifndef NM_PPP_STATUS_H -#define NM_PPP_STATUS_H +#ifndef __NETWORKMANAGER_PPP_STATUS_H__ +#define __NETWORKMANAGER_PPP_STATUS_H__ typedef enum { NM_PPP_STATUS_UNKNOWN, @@ -40,4 +40,4 @@ typedef enum { NM_PPP_STATUS_MASTER } NMPPPStatus; -#endif /* NM_PPP_STATUS_H */ +#endif /* __NETWORKMANAGER_PPP_STATUS_H__ */ 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__ */ diff --git a/src/settings/nm-agent-manager.h b/src/settings/nm-agent-manager.h index 564a99a137..1aac2d2ae0 100644 --- a/src/settings/nm-agent-manager.h +++ b/src/settings/nm-agent-manager.h @@ -18,8 +18,8 @@ * Copyright (C) 2010 - 2011 Red Hat, Inc. */ -#ifndef NM_AGENT_MANAGER_H -#define NM_AGENT_MANAGER_H +#ifndef __NETWORKMANAGER_AGENT_MANAGER_H__ +#define __NETWORKMANAGER_AGENT_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -103,4 +103,4 @@ gboolean nm_agent_manager_all_agents_have_capability (NMAgentManager *manager, NMAuthSubject *subject, NMSecretAgentCapabilities capability); -#endif /* NM_AGENT_MANAGER_H */ +#endif /* __NETWORKMANAGER_AGENT_MANAGER_H__ */ diff --git a/src/settings/nm-secret-agent.h b/src/settings/nm-secret-agent.h index 315209cdfb..285a447e2d 100644 --- a/src/settings/nm-secret-agent.h +++ b/src/settings/nm-secret-agent.h @@ -18,8 +18,8 @@ * Copyright (C) 2010 - 2011 Red Hat, Inc. */ -#ifndef NM_SECRET_AGENT_H -#define NM_SECRET_AGENT_H +#ifndef __NETWORKMANAGER_SECRET_AGENT_H__ +#define __NETWORKMANAGER_SECRET_AGENT_H__ #include <glib.h> #include <glib-object.h> @@ -103,4 +103,4 @@ gconstpointer nm_secret_agent_delete_secrets (NMSecretAgent *agent, NMSecretAgentCallback callback, gpointer callback_data); -#endif /* NM_SECRET_AGENT_H */ +#endif /* __NETWORKMANAGER_SECRET_AGENT_H__ */ diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index ae88c1ac47..cacb8b9689 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -19,8 +19,8 @@ * (C) Copyright 2008 - 2013 Red Hat, Inc. */ -#ifndef NM_SETTINGS_CONNECTION_H -#define NM_SETTINGS_CONNECTION_H +#ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__ +#define __NETWORKMANAGER_SETTINGS_CONNECTION_H__ #include <net/ethernet.h> @@ -166,4 +166,4 @@ gboolean nm_settings_connection_get_nm_generated (NMSettingsConnection *connecti G_END_DECLS -#endif /* NM_SETTINGS_CONNECTION_H */ +#endif /* __NETWORKMANAGER_SETTINGS_CONNECTION_H__ */ diff --git a/src/settings/nm-settings-error.h b/src/settings/nm-settings-error.h index a2b4cd466c..a63968a4b1 100644 --- a/src/settings/nm-settings-error.h +++ b/src/settings/nm-settings-error.h @@ -19,8 +19,8 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#ifndef NM_SETTINGS_ERROR_H -#define NM_SETTINGS_ERROR_H +#ifndef __NETWORKMANAGER_SETTINGS_ERROR_H__ +#define __NETWORKMANAGER_SETTINGS_ERROR_H__ #include <glib.h> #include <glib-object.h> @@ -50,4 +50,4 @@ GQuark nm_settings_error_quark (void); #define NM_TYPE_SETTINGS_ERROR (nm_settings_error_get_type ()) GType nm_settings_error_get_type (void); -#endif /* NM_SETTINGS_ERROR_H */ +#endif /* __NETWORKMANAGER_SETTINGS_ERROR_H__ */ diff --git a/src/settings/nm-settings-utils.h b/src/settings/nm-settings-utils.h index f669d2b101..4ab8d44eee 100644 --- a/src/settings/nm-settings-utils.h +++ b/src/settings/nm-settings-utils.h @@ -16,8 +16,8 @@ * (C) Copyright 2011 Red Hat, Inc. */ -#ifndef NM_SETTINGS_UTILS_H -#define NM_SETTINGS_UTILS_H +#ifndef __NETWORKMANAGER_SETTINGS_UTILS_H__ +#define __NETWORKMANAGER_SETTINGS_UTILS_H__ #include <glib.h> diff --git a/src/settings/nm-system-config-interface.h b/src/settings/nm-system-config-interface.h index d1c83ec334..144aadbf79 100644 --- a/src/settings/nm-system-config-interface.h +++ b/src/settings/nm-system-config-interface.h @@ -19,8 +19,8 @@ * Copyright (C) 2008 Novell, Inc. */ -#ifndef NM_SYSTEM_CONFIG_INTERFACE_H -#define NM_SYSTEM_CONFIG_INTERFACE_H +#ifndef __NETWORKMANAGER_SYSTEM_CONFIG_INTERFACE_H__ +#define __NETWORKMANAGER_SYSTEM_CONFIG_INTERFACE_H__ #include <glib.h> #include <glib-object.h> diff --git a/src/settings/plugins/example/nm-example-connection.h b/src/settings/plugins/example/nm-example-connection.h index 6d57a1ad21..ddbd7ac2da 100644 --- a/src/settings/plugins/example/nm-example-connection.h +++ b/src/settings/plugins/example/nm-example-connection.h @@ -18,8 +18,8 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#ifndef NM_EXAMPLE_CONNECTION_H -#define NM_EXAMPLE_CONNECTION_H +#ifndef __NETWORKMANAGER_EXAMPLE_CONNECTION_H__ +#define __NETWORKMANAGER_EXAMPLE_CONNECTION_H__ #include <nm-settings-connection.h> @@ -52,4 +52,4 @@ const char *nm_example_connection_get_path (NMExampleConnection *self); G_END_DECLS -#endif /* NM_EXAMPLE_CONNECTION_H */ +#endif /* __NETWORKMANAGER_EXAMPLE_CONNECTION_H__ */ diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h index cc76d9543b..37eacaf0d3 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h @@ -18,8 +18,8 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#ifndef NM_IFCFG_CONNECTION_H -#define NM_IFCFG_CONNECTION_H +#ifndef __NETWORKMANAGER_IFCFG_CONNECTION_H__ +#define __NETWORKMANAGER_IFCFG_CONNECTION_H__ G_BEGIN_DECLS @@ -65,4 +65,4 @@ gboolean nm_ifcfg_connection_update (NMIfcfgConnection *self, G_END_DECLS -#endif /* NM_IFCFG_CONNECTION_H */ +#endif /* __NETWORKMANAGER_IFCFG_CONNECTION_H__ */ diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.h b/src/settings/plugins/ifnet/nm-ifnet-connection.h index 1cb67c3410..baa4c07ed5 100644 --- a/src/settings/plugins/ifnet/nm-ifnet-connection.h +++ b/src/settings/plugins/ifnet/nm-ifnet-connection.h @@ -19,8 +19,8 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#ifndef NM_IFNET_CONNECTION_H -#define NM_IFNET_CONNECTION_H +#ifndef __NETWORKMANAGER_IFNET_CONNECTION_H__ +#define __NETWORKMANAGER_IFNET_CONNECTION_H__ #include <nm-settings-connection.h> #include "net_parser.h" diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h index 447af78a97..be2ebc0a3e 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h @@ -21,8 +21,8 @@ * (C) Copyright 2008 Canonical Ltd. */ -#ifndef NM_IFUPDOWN_CONNECTION_H -#define NM_IFUPDOWN_CONNECTION_H +#ifndef __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__ +#define __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__ #include <nm-settings-connection.h> #include "interface_parser.h" @@ -52,4 +52,4 @@ NMIfupdownConnection *nm_ifupdown_connection_new (if_block *block); G_END_DECLS -#endif /* NM_IFUPDOWN_CONNECTION_H */ +#endif /* __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__ */ diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.h b/src/settings/plugins/keyfile/nm-keyfile-connection.h index 07dcafcb29..135bb49f73 100644 --- a/src/settings/plugins/keyfile/nm-keyfile-connection.h +++ b/src/settings/plugins/keyfile/nm-keyfile-connection.h @@ -19,8 +19,8 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#ifndef NM_KEYFILE_CONNECTION_H -#define NM_KEYFILE_CONNECTION_H +#ifndef __NETWORKMANAGER_KEYFILE_CONNECTION_H__ +#define __NETWORKMANAGER_KEYFILE_CONNECTION_H__ #include <nm-settings-connection.h> @@ -52,4 +52,4 @@ void nm_keyfile_connection_set_path (NMKeyfileConnection *self, const cha G_END_DECLS -#endif /* NM_KEYFILE_CONNECTION_H */ +#endif /* __NETWORKMANAGER_KEYFILE_CONNECTION_H__ */ diff --git a/src/supplicant-manager/nm-call-store.h b/src/supplicant-manager/nm-call-store.h index b24c97a465..bcee54cfbb 100644 --- a/src/supplicant-manager/nm-call-store.h +++ b/src/supplicant-manager/nm-call-store.h @@ -18,8 +18,8 @@ * (C) Copyright 2007 Novell, Inc. */ -#ifndef NM_CALLBACK_STORE_H -#define NM_CALLBACK_STORE_H +#ifndef __NETWORKMANAGER_CALLBACK_STORE_H__ +#define __NETWORKMANAGER_CALLBACK_STORE_H__ #include <glib-object.h> #include <dbus/dbus-glib.h> @@ -38,4 +38,4 @@ void nm_call_store_remove (NMCallStore *store, void nm_call_store_clear (NMCallStore *store); void nm_call_store_destroy (NMCallStore *store); -#endif /* NM_CALLBACK_STORE_H */ +#endif /* __NETWORKMANAGER_CALLBACK_STORE_H__ */ diff --git a/src/supplicant-manager/nm-supplicant-config.h b/src/supplicant-manager/nm-supplicant-config.h index 75d6b779ff..482e3545b6 100644 --- a/src/supplicant-manager/nm-supplicant-config.h +++ b/src/supplicant-manager/nm-supplicant-config.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#ifndef NM_SUPPLICANT_CONFIG_H -#define NM_SUPPLICANT_CONFIG_H +#ifndef __NETWORKMANAGER_SUPPLICANT_CONFIG_H__ +#define __NETWORKMANAGER_SUPPLICANT_CONFIG_H__ #include <glib-object.h> #include <nm-setting-wireless.h> diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant-manager/nm-supplicant-interface.h index 633c16cc56..47ccc79493 100644 --- a/src/supplicant-manager/nm-supplicant-interface.h +++ b/src/supplicant-manager/nm-supplicant-interface.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#ifndef NM_SUPPLICANT_INTERFACE_H -#define NM_SUPPLICANT_INTERFACE_H +#ifndef __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__ +#define __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__ #include <glib-object.h> #include <dbus/dbus.h> diff --git a/src/supplicant-manager/nm-supplicant-manager.h b/src/supplicant-manager/nm-supplicant-manager.h index 9e2f3b21b1..5e7f1eb596 100644 --- a/src/supplicant-manager/nm-supplicant-manager.h +++ b/src/supplicant-manager/nm-supplicant-manager.h @@ -19,8 +19,8 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#ifndef NM_SUPPLICANT_MANAGER_H -#define NM_SUPPLICANT_MANAGER_H +#ifndef __NETWORKMANAGER_SUPPLICANT_MANAGER_H__ +#define __NETWORKMANAGER_SUPPLICANT_MANAGER_H__ #include <glib-object.h> #include "nm-supplicant-types.h" @@ -65,4 +65,4 @@ void nm_supplicant_manager_iface_release (NMSupplicantManager *mgr, gboolean nm_supplicant_manager_available (NMSupplicantManager *mgr); -#endif /* NM_SUPPLICANT_MANAGER_H */ +#endif /* __NETWORKMANAGER_SUPPLICANT_MANAGER_H__ */ diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.h b/src/supplicant-manager/nm-supplicant-settings-verify.h index eb213e0e8d..920343bac9 100644 --- a/src/supplicant-manager/nm-supplicant-settings-verify.h +++ b/src/supplicant-manager/nm-supplicant-settings-verify.h @@ -18,8 +18,8 @@ * Copyright (C) 2006 - 2008 Red Hat, Inc. */ -#ifndef NM_SUPPLICANT_SETTINGS_VERIFY_H -#define NM_SUPPLICANT_SETTINGS_VERIFY_H +#ifndef __NETWORKMANAGER_SUPPLICANT_SETTINGS_VERIFY_H__ +#define __NETWORKMANAGER_SUPPLICANT_SETTINGS_VERIFY_H__ typedef enum { TYPE_INVALID = 0, @@ -35,4 +35,4 @@ OptType nm_supplicant_settings_verify_setting (const char * key, const guint32 len); -#endif /* NM_SUPPLICANT_SETTINGS_VERIFY_H */ +#endif /* __NETWORKMANAGER_SUPPLICANT_SETTINGS_VERIFY_H__ */ diff --git a/src/supplicant-manager/nm-supplicant-types.h b/src/supplicant-manager/nm-supplicant-types.h index 16e4a6ba4d..619f0c3e91 100644 --- a/src/supplicant-manager/nm-supplicant-types.h +++ b/src/supplicant-manager/nm-supplicant-types.h @@ -18,8 +18,8 @@ * Copyright (C) 2006 - 2008 Red Hat, Inc. */ -#ifndef NM_SUPPLICANT_TYPES_H -#define NM_SUPPLICANT_TYPES_H +#ifndef __NETWORKMANAGER_SUPPLICANT_TYPES_H__ +#define __NETWORKMANAGER_SUPPLICANT_TYPES_H__ typedef struct _NMSupplicantManager NMSupplicantManager; typedef struct _NMSupplicantInterface NMSupplicantInterface; diff --git a/src/tests/config/nm-test-device.h b/src/tests/config/nm-test-device.h index 5c4f28b51e..00b21c426f 100644 --- a/src/tests/config/nm-test-device.h +++ b/src/tests/config/nm-test-device.h @@ -18,8 +18,8 @@ * Copyright 2013 Red Hat, Inc. */ -#ifndef NM_TEST_DEVICE_H -#define NM_TEST_DEVICE_H +#ifndef __NETWORKMANAGER_TEST_DEVICE_H__ +#define __NETWORKMANAGER_TEST_DEVICE_H__ #include <nm-device.h> diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h index 209e2747dc..156f79f77c 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h @@ -19,8 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#ifndef NM_VPN_CONNECTION_H -#define NM_VPN_CONNECTION_H +#ifndef __NETWORKMANAGER_VPN_CONNECTION_H__ +#define __NETWORKMANAGER_VPN_CONNECTION_H__ #include <glib.h> #include <glib-object.h> @@ -90,4 +90,4 @@ int nm_vpn_connection_get_ip_ifindex (NMVpnConnection *connect guint32 nm_vpn_connection_get_ip4_internal_gateway (NMVpnConnection *connection); struct in6_addr * nm_vpn_connection_get_ip6_internal_gateway (NMVpnConnection *connection); -#endif /* NM_VPN_CONNECTION_H */ +#endif /* __NETWORKMANAGER_VPN_CONNECTION_H__ */ diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index 5cc4b30a1d..bb272be9a6 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -19,8 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#ifndef NM_VPN_MANAGER_H -#define NM_VPN_MANAGER_H +#ifndef __NETWORKMANAGER_VPN_MANAGER_H__ +#define __NETWORKMANAGER_VPN_MANAGER_H__ #include <glib.h> #include <glib-object.h> @@ -67,4 +67,4 @@ gboolean nm_vpn_manager_deactivate_connection (NMVpnManager *manager, NMVpnConnection *connection, NMVpnConnectionStateReason reason); -#endif /* NM_VPN_MANAGER_H */ +#endif /* __NETWORKMANAGER_VPN_MANAGER_H__ */ diff --git a/src/vpn-manager/nm-vpn-service.h b/src/vpn-manager/nm-vpn-service.h index 84d7dc8c51..cafa6904af 100644 --- a/src/vpn-manager/nm-vpn-service.h +++ b/src/vpn-manager/nm-vpn-service.h @@ -19,8 +19,8 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#ifndef NM_VPN_SERVICE_H -#define NM_VPN_SERVICE_H +#ifndef __NETWORKMANAGER_VPN_SERVICE_H__ +#define __NETWORKMANAGER_VPN_SERVICE_H__ #include <glib.h> #include <glib-object.h> |