Commit c81fb49a authored by Dan Winship's avatar Dan Winship

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.
parent 76ac21b2
......@@ -18,8 +18,8 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
#ifndef NM_DISPATCHER_UTILS_H
#define NM_DISPATCHER_UTILS_H
#ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
#define __NETWORKMANAGER_DISPATCHER_UTILS_H__
#include <glib.h>
......@@ -37,5 +37,5 @@ nm_dispatcher_utils_construct_envp (const char *action,
GHashTable *vpn_ip6_props,
char **out_iface);
#endif /* NM_DISPATCHER_UTILS_H */
#endif /* __NETWORKMANAGER_DISPATCHER_UTILS_H__ */
......@@ -17,8 +17,8 @@
* Copyright 2008 Red Hat, Inc.
*/
#ifndef DBUS_GLIB_TYPES_H
#define DBUS_GLIB_TYPES_H
#ifndef __NM_DBUS_GLIB_TYPES_H__
#define __NM_DBUS_GLIB_TYPES_H__
#include <dbus/dbus-glib.h>
......@@ -37,4 +37,4 @@
#define DBUS_TYPE_G_IP6_ROUTE (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, G_TYPE_INVALID))
#define DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ROUTE))
#endif /* DBUS_GLIB_TYPES_H */
#endif /* __NM_DBUS_GLIB_TYPES_H__ */
......@@ -17,8 +17,8 @@
* Copyright 2008 - 2011 Red Hat, Inc.
*/
#ifndef NM_GLIB_COMPAT_H
#define NM_GLIB_COMPAT_H
#ifndef __NM_GLIB_COMPAT_H__
#define __NM_GLIB_COMPAT_H__
#include <glib.h>
......@@ -124,4 +124,4 @@ __nmtst_g_test_skip (const gchar *msg)
}
#define g_test_skip __nmtst_g_test_skip
#endif /* NM_GLIB_COMPAT_H */
#endif /* __NM_GLIB_COMPAT_H__ */
......@@ -17,8 +17,8 @@
* Copyright 2013 Red Hat, Inc.
*/
#ifndef NM_GVALUEARRAY_COMPAT_H
#define NM_GVALUEARRAY_COMPAT_H
#ifndef __NM_GVALUEARRAY_COMPAT_H__
#define __NM_GVALUEARRAY_COMPAT_H__
#include <glib.h>
......@@ -105,4 +105,4 @@ __g_value_array_free (GValueArray *value_array)
G_GNUC_END_IGNORE_DEPRECATIONS \
})
#endif /* NM_GVALUEARRAY_COMPAT_H */
#endif /* __NM_GVALUEARRAY_COMPAT_H__ */
......@@ -243,7 +243,7 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
if (!__nmtst_internal.assert_logging) {
gboolean success = TRUE;
#ifdef NM_LOGGING_H
#ifdef __NETWORKMANAGER_LOGGING_H__
success = nm_logging_setup (log_level, log_domains, NULL, NULL);
#endif
g_assert (success);
......@@ -293,13 +293,13 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
g_once_init_leave (&atexit_registered, 1);
}
#ifdef NETWORK_MANAGER_UTILS_H
#ifdef __NETWORKMANAGER_UTILS_H__
/* ensure that monotonic timestamp is called (because it initially logs a line) */
nm_utils_get_monotonic_timestamp_s ();
#endif
}
#ifdef NM_LOGGING_H
#ifdef __NETWORKMANAGER_LOGGING_H__
inline static void
nmtst_init_with_logging (int *argc, char ***argv, const char *log_level, const char *log_domains)
{
......@@ -544,7 +544,7 @@ __nmtst_spawn_sync (const char *working_directory, char **standard_out, char **s
/*******************************************************************************/
#ifdef NM_PLATFORM_H
#ifdef __NETWORKMANAGER_PLATFORM_H__
inline static NMPlatformIP6Address *
nmtst_platform_ip6_address (const char *address, const char *peer_address, guint plen)
......@@ -649,7 +649,7 @@ nmtst_platform_ip6_routes_equal (const NMPlatformIP6Route *a, const NMPlatformIP
#endif
#ifdef NM_IP4_CONFIG_H
#ifdef __NETWORKMANAGER_IP4_CONFIG_H__
inline static NMIP4Config *
nmtst_ip4_config_clone (NMIP4Config *config)
......@@ -665,7 +665,7 @@ nmtst_ip4_config_clone (NMIP4Config *config)
#endif
#ifdef NM_IP6_CONFIG_H
#ifdef __NETWORKMANAGER_IP6_CONFIG_H__
inline static NMIP6Config *
nmtst_ip6_config_clone (NMIP6Config *config)
......@@ -680,7 +680,7 @@ nmtst_ip6_config_clone (NMIP6Config *config)
#endif
#ifdef NM_CONNECTION_H
#ifdef __NM_CONNECTION_H__
inline static NMConnection *
nmtst_create_minimal_connection (const char *id, const char *uuid, const char *type, NMSettingConnection **out_s_con)
......
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_CONNECTION_H
#define NM_CONNECTION_H
#ifndef __NM_CONNECTION_H__
#define __NM_CONNECTION_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -251,4 +251,4 @@ NMSettingVlan * nm_connection_get_setting_vlan (NMConnec
G_END_DECLS
#endif /* NM_CONNECTION_H */
#endif /* __NM_CONNECTION_H__ */
......@@ -23,8 +23,8 @@
* used by some external code that does not link to libnm.
*/
#ifndef NM_DBUS_INTERFACE_H
#define NM_DBUS_INTERFACE_H
#ifndef __NM_DBUS_INTERFACE_H__
#define __NM_DBUS_INTERFACE_H__
#include "nm-version.h"
......@@ -607,4 +607,4 @@ typedef enum /*< flags >*/ {
NM_SECRET_AGENT_CAPABILITY_LAST = NM_SECRET_AGENT_CAPABILITY_VPN_HINTS
} NMSecretAgentCapabilities;
#endif /* NM_DBUS_INTERFACE_H */
#endif /* __NM_DBUS_INTERFACE_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_PARAM_SPEC_SPECIALIZED_H
#define NM_PARAM_SPEC_SPECIALIZED_H
#ifndef __NM_PARAM_SPEC_SPECIALIZED_H__
#define __NM_PARAM_SPEC_SPECIALIZED_H__
#include <glib-object.h>
......@@ -40,4 +40,4 @@ GParamSpec *_nm_param_spec_specialized (const char *name,
GType specialized_type,
GParamFlags flags);
#endif /* NM_PARAM_SPEC_SPECIALIZED_H */
#endif /* __NM_PARAM_SPEC_SPECIALIZED_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_8021X_H
#define NM_SETTING_8021X_H
#ifndef __NM_SETTING_8021X_H__
#define __NM_SETTING_8021X_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -292,4 +292,4 @@ NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format (NMSett
G_END_DECLS
#endif /* NM_SETTING_8021X_H */
#endif /* __NM_SETTING_8021X_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2007 - 2008 Red Hat, Inc.
*/
#ifndef NM_SETTING_ADSL_H
#define NM_SETTING_ADSL_H
#ifndef __NM_SETTING_ADSL_H__
#define __NM_SETTING_ADSL_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -94,4 +94,4 @@ NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting)
G_END_DECLS
#endif /* NM_SETTING_ADSL_H */
#endif /* __NM_SETTING_ADSL_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_BLUETOOTH_H
#define NM_SETTING_BLUETOOTH_H
#ifndef __NM_SETTING_BLUETOOTH_H__
#define __NM_SETTING_BLUETOOTH_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -98,4 +98,4 @@ const char * nm_setting_bluetooth_get_connection_type (NMSettingBluetooth *
G_END_DECLS
#endif /* NM_SETTING_BLUETOOTH_H */
#endif /* __NM_SETTING_BLUETOOTH_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc.
*/
#ifndef NM_SETTING_BOND_H
#define NM_SETTING_BOND_H
#ifndef __NM_SETTING_BOND_H__
#define __NM_SETTING_BOND_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -114,4 +114,4 @@ const char * nm_setting_bond_get_option_default (NMSettingBond *setting,
G_END_DECLS
#endif /* NM_SETTING_BOND_H */
#endif /* __NM_SETTING_BOND_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2012 Red Hat, Inc.
*/
#ifndef NM_SETTING_BRIDGE_PORT_H
#define NM_SETTING_BRIDGE_PORT_H
#ifndef __NM_SETTING_BRIDGE_PORT_H__
#define __NM_SETTING_BRIDGE_PORT_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -82,4 +82,4 @@ gboolean nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *settin
G_END_DECLS
#endif /* NM_SETTING_BRIDGE_PORT_H */
#endif /* __NM_SETTING_BRIDGE_PORT_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2011 - 2012 Red Hat, Inc.
*/
#ifndef NM_SETTING_BRIDGE_H
#define NM_SETTING_BRIDGE_H
#ifndef __NM_SETTING_BRIDGE_H__
#define __NM_SETTING_BRIDGE_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -97,4 +97,4 @@ guint32 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);
G_END_DECLS
#endif /* NM_SETTING_BRIDGE_H */
#endif /* __NM_SETTING_BRIDGE_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_CDMA_H
#define NM_SETTING_CDMA_H
#ifndef __NM_SETTING_CDMA_H__
#define __NM_SETTING_CDMA_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -85,4 +85,4 @@ NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting)
G_END_DECLS
#endif /* NM_SETTING_CDMA_H */
#endif /* __NM_SETTING_CDMA_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_CONNECTION_H
#define NM_SETTING_CONNECTION_H
#ifndef __NM_SETTING_CONNECTION_H__
#define __NM_SETTING_CONNECTION_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -145,4 +145,4 @@ guint32 nm_setting_connection_get_gateway_ping_timeout (NMSettingConnection
G_END_DECLS
#endif /* NM_SETTING_CONNECTION_H */
#endif /* __NM_SETTING_CONNECTION_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2013 Red Hat, Inc.
*/
#ifndef NM_SETTING_DCB_H
#define NM_SETTING_DCB_H
#ifndef __NM_SETTING_DCB_H__
#define __NM_SETTING_DCB_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -177,4 +177,4 @@ void nm_setting_dcb_set_priority_traffic_class (NMSettingDcb *setting,
G_END_DECLS
#endif /* NM_SETTING_DCB_H */
#endif /* __NM_SETTING_DCB_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2013 Red Hat, Inc.
*/
#ifndef NM_SETTING_GENERIC_H
#define NM_SETTING_GENERIC_H
#ifndef __NM_SETTING_GENERIC_H__
#define __NM_SETTING_GENERIC_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -72,4 +72,4 @@ NMSetting * nm_setting_generic_new (void);
G_END_DECLS
#endif /* NM_SETTING_GENERIC_H */
#endif /* __NM_SETTING_GENERIC_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_GSM_H
#define NM_SETTING_GSM_H
#ifndef __NM_SETTING_GSM_H__
#define __NM_SETTING_GSM_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -100,4 +100,4 @@ NMSettingSecretFlags nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
G_END_DECLS
#endif /* NM_SETTING_GSM_H */
#endif /* __NM_SETTING_GSM_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2011 Red Hat, Inc.
*/
#ifndef NM_SETTING_INFINIBAND_H
#define NM_SETTING_INFINIBAND_H
#ifndef __NM_SETTING_INFINIBAND_H__
#define __NM_SETTING_INFINIBAND_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -83,4 +83,4 @@ const char * nm_setting_infiniband_get_parent (NMSettingInfiniband
G_END_DECLS
#endif /* NM_SETTING_INFINIBAND_H */
#endif /* __NM_SETTING_INFINIBAND_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_IP4_CONFIG_H
#define NM_SETTING_IP4_CONFIG_H
#ifndef __NM_SETTING_IP4_CONFIG_H__
#define __NM_SETTING_IP4_CONFIG_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -223,4 +223,4 @@ gboolean nm_setting_ip4_config_get_may_fail (NMSettingIP4Config *
G_END_DECLS
#endif /* NM_SETTING_IP4_CONFIG_H */
#endif /* __NM_SETTING_IP4_CONFIG_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
#ifndef NM_SETTING_IP6_CONFIG_H
#define NM_SETTING_IP6_CONFIG_H
#ifndef __NM_SETTING_IP6_CONFIG_H__
#define __NM_SETTING_IP6_CONFIG_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -250,4 +250,4 @@ NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Con
G_END_DECLS
#endif /* NM_SETTING_IP6_CONFIG_H */
#endif /* __NM_SETTING_IP6_CONFIG_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2009 One Laptop per Child
*/
#ifndef NM_SETTING_OLPC_MESH_H
#define NM_SETTING_OLPC_MESH_H
#ifndef __NM_SETTING_OLPC_MESH_H__
#define __NM_SETTING_OLPC_MESH_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -80,4 +80,4 @@ const GByteArray *nm_setting_olpc_mesh_get_dhcp_anycast_address (NMSettingOlpcMe
G_END_DECLS
#endif /* NM_SETTING_OLPC_MESH_H */
#endif /* __NM_SETTING_OLPC_MESH_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_PPP_H
#define NM_SETTING_PPP_H
#ifndef __NM_SETTING_PPP_H__
#define __NM_SETTING_PPP_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -113,4 +113,4 @@ guint32 nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting);
G_END_DECLS
#endif /* NM_SETTING_PPP_H */
#endif /* __NM_SETTING_PPP_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_PPPOE_H
#define NM_SETTING_PPPOE_H
#ifndef __NM_SETTING_PPPOE_H__
#define __NM_SETTING_PPPOE_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -85,4 +85,4 @@ NMSettingSecretFlags nm_setting_pppoe_get_password_flags (NMSettingPppoe *settin
G_END_DECLS
#endif /* NM_SETTING_PPPOE_H */
#endif /* __NM_SETTING_PPPOE_H__ */
......@@ -18,8 +18,8 @@
* Copyright 2011 Red Hat, Inc.
*/
#ifndef NM_SETTING_PRIVATE_H
#define NM_SETTING_PRIVATE_H
#ifndef __NM_SETTING_PRIVATE_H__
#define __NM_SETTING_PRIVATE_H__
#include "nm-setting.h"
#include "nm-glib-compat.h"
......
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_SERIAL_H
#define NM_SETTING_SERIAL_H
#ifndef __NM_SETTING_SERIAL_H__
#define __NM_SETTING_SERIAL_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -87,4 +87,4 @@ guint64 nm_setting_serial_get_send_delay (NMSettingSerial *setting);
G_END_DECLS
#endif /* NM_SETTING_SERIAL_H */
#endif /* __NM_SETTING_SERIAL_H__ */
......@@ -18,8 +18,8 @@
* Copyright 2013 Jiri Pirko <jiri@resnulli.us>
*/
#ifndef NM_SETTING_TEAM_PORT_H
#define NM_SETTING_TEAM_PORT_H
#ifndef __NM_SETTING_TEAM_PORT_H__
#define __NM_SETTING_TEAM_PORT_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -75,4 +75,4 @@ const char * nm_setting_team_port_get_config (NMSettingTeamPort *setting);
G_END_DECLS
#endif /* NM_SETTING_TEAM_PORT_H */
#endif /* __NM_SETTING_TEAM_PORT_H__ */
......@@ -18,8 +18,8 @@
* Copyright 2013 Jiri Pirko <jiri@resnulli.us>
*/
#ifndef NM_SETTING_TEAM_H
#define NM_SETTING_TEAM_H
#ifndef __NM_SETTING_TEAM_H__
#define __NM_SETTING_TEAM_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -77,4 +77,4 @@ const char * nm_setting_team_get_config (NMSettingTeam *setting);
G_END_DECLS
#endif /* NM_SETTING_TEAM_H */
#endif /* __NM_SETTING_TEAM_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2011 - 2014 Red Hat, Inc.
*/
#ifndef NM_SETTING_VLAN_H
#define NM_SETTING_VLAN_H
#ifndef __NM_SETTING_VLAN_H__
#define __NM_SETTING_VLAN_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -152,4 +152,4 @@ gboolean nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
G_END_DECLS
#endif /* NM_SETTING_VLAN_H */
#endif /* __NM_SETTING_VLAN_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_VPN_H
#define NM_SETTING_VPN_H
#ifndef __NM_SETTING_VPN_H__
#define __NM_SETTING_VPN_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -113,4 +113,4 @@ void nm_setting_vpn_foreach_secret (NMSettingVpn *setting,
G_END_DECLS
#endif /* NM_SETTING_VPN_H */
#endif /* __NM_SETTING_VPN_H__ */
......@@ -19,8 +19,8 @@
* Copyright 2009 Novell, Inc.
*/
#ifndef NM_SETTING_WIMAX_H
#define NM_SETTING_WIMAX_H
#ifndef __NM_SETTING_WIMAX_H__
#define __NM_SETTING_WIMAX_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -77,4 +77,4 @@ const GByteArray *nm_setting_wimax_get_mac_address (NMSettingWimax *setting);
G_END_DECLS
#endif /* NM_SETTING_WIMAX_H */
#endif /* __NM_SETTING_WIMAX_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_WIRED_H
#define NM_SETTING_WIRED_H
#ifndef __NM_SETTING_WIRED_H__
#define __NM_SETTING_WIRED_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -122,4 +122,4 @@ const char ** nm_setting_wired_get_valid_s390_options (NMSettingWired *setti
G_END_DECLS
#endif /* NM_SETTING_WIRED_H */
#endif /* __NM_SETTING_WIRED_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_WIRELESS_SECURITY_H
#define NM_SETTING_WIRELESS_SECURITY_H
#ifndef __NM_SETTING_WIRELESS_SECURITY_H__
#define __NM_SETTING_WIRELESS_SECURITY_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -173,4 +173,4 @@ NMWepKeyType nm_setting_wireless_security_get_wep_key_type (NMSettingWirelessSec
G_END_DECLS
#endif /* NM_SETTING_WIRELESS_SECURITY_H */
#endif /* __NM_SETTING_WIRELESS_SECURITY_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_WIRELESS_H
#define NM_SETTING_WIRELESS_H
#ifndef __NM_SETTING_WIRELESS_H__
#define __NM_SETTING_WIRELESS_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -160,4 +160,4 @@ gboolean nm_setting_wireless_ap_security_compatible (NMSettingWireless
G_END_DECLS
#endif /* NM_SETTING_WIRELESS_H */
#endif /* __NM_SETTING_WIRELESS_H__ */
......@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
#ifndef NM_SETTING_H
#define NM_SETTING_H
#ifndef __NM_SETTING_H__
#define __NM_SETTING_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -315,4 +315,4 @@ const char *nm_setting_get_virtual_iface_name (NMSetting *setting);
G_END_DECLS
#endif /* NM_SETTING_H */
#endif /* __NM_SETTING_H__ */
......@@ -18,8 +18,8 @@
* Copyright 2005 - 2013 Red Hat, Inc.
*/
#ifndef NM_UTILS_H
#define NM_UTILS_H
#ifndef __NM_UTILS_H__
#define __NM_UTILS_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
......@@ -173,4 +173,4 @@ gboolean nm_utils_check_virtual_device_compatibility (GType virtual_type, GType
G_END_DECLS
#endif /* NM_UTILS_H */
#endif /* __NM_UTILS_H__ */
......@@ -23,8 +23,8 @@
* used by some external code that does not link to libnm.
*/
#ifndef NM_VPN_DBUS_INTERFACE_H
#define NM_VPN_DBUS_INTERFACE_H
#ifndef __NM_VPN_DBUS_INTERFACE_H__
#define __NM_VPN_DBUS_INTERFACE_H__
/*
* dbus services details
......@@ -299,4 +299,4 @@ typedef enum {
/* boolean: prevent this VPN connection from ever getting the default route */
#define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
#endif /* NM_VPN_DBUS_INTERFACE_H */
#endif /* __NM_VPN_DBUS_INTERFACE_H__ */
......@@ -18,8 +18,8 @@
* Copyright 2014 Red Hat, Inc.
*/
#ifndef NETWORKMANAGER_H
#define NETWORKMANAGER_H