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 @@ ...@@ -18,8 +18,8 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc. * Copyright (C) 2008 - 2011 Red Hat, Inc.
*/ */
#ifndef NM_DISPATCHER_UTILS_H #ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
#define NM_DISPATCHER_UTILS_H #define __NETWORKMANAGER_DISPATCHER_UTILS_H__
#include <glib.h> #include <glib.h>
...@@ -37,5 +37,5 @@ nm_dispatcher_utils_construct_envp (const char *action, ...@@ -37,5 +37,5 @@ nm_dispatcher_utils_construct_envp (const char *action,
GHashTable *vpn_ip6_props, GHashTable *vpn_ip6_props,
char **out_iface); char **out_iface);
#endif /* NM_DISPATCHER_UTILS_H */ #endif /* __NETWORKMANAGER_DISPATCHER_UTILS_H__ */
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* Copyright 2008 Red Hat, Inc. * Copyright 2008 Red Hat, Inc.
*/ */
#ifndef DBUS_GLIB_TYPES_H #ifndef __NM_DBUS_GLIB_TYPES_H__
#define DBUS_GLIB_TYPES_H #define __NM_DBUS_GLIB_TYPES_H__
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
...@@ -37,4 +37,4 @@ ...@@ -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_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)) #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 @@ ...@@ -17,8 +17,8 @@
* Copyright 2008 - 2011 Red Hat, Inc. * Copyright 2008 - 2011 Red Hat, Inc.
*/ */
#ifndef NM_GLIB_COMPAT_H #ifndef __NM_GLIB_COMPAT_H__
#define NM_GLIB_COMPAT_H #define __NM_GLIB_COMPAT_H__
#include <glib.h> #include <glib.h>
...@@ -124,4 +124,4 @@ __nmtst_g_test_skip (const gchar *msg) ...@@ -124,4 +124,4 @@ __nmtst_g_test_skip (const gchar *msg)
} }
#define g_test_skip __nmtst_g_test_skip #define g_test_skip __nmtst_g_test_skip
#endif /* NM_GLIB_COMPAT_H */ #endif /* __NM_GLIB_COMPAT_H__ */
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* Copyright 2013 Red Hat, Inc. * Copyright 2013 Red Hat, Inc.
*/ */
#ifndef NM_GVALUEARRAY_COMPAT_H #ifndef __NM_GVALUEARRAY_COMPAT_H__
#define NM_GVALUEARRAY_COMPAT_H #define __NM_GVALUEARRAY_COMPAT_H__
#include <glib.h> #include <glib.h>
...@@ -105,4 +105,4 @@ __g_value_array_free (GValueArray *value_array) ...@@ -105,4 +105,4 @@ __g_value_array_free (GValueArray *value_array)
G_GNUC_END_IGNORE_DEPRECATIONS \ 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_ ...@@ -243,7 +243,7 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
if (!__nmtst_internal.assert_logging) { if (!__nmtst_internal.assert_logging) {
gboolean success = TRUE; gboolean success = TRUE;
#ifdef NM_LOGGING_H #ifdef __NETWORKMANAGER_LOGGING_H__
success = nm_logging_setup (log_level, log_domains, NULL, NULL); success = nm_logging_setup (log_level, log_domains, NULL, NULL);
#endif #endif
g_assert (success); g_assert (success);
...@@ -293,13 +293,13 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ ...@@ -293,13 +293,13 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
g_once_init_leave (&atexit_registered, 1); 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) */ /* ensure that monotonic timestamp is called (because it initially logs a line) */
nm_utils_get_monotonic_timestamp_s (); nm_utils_get_monotonic_timestamp_s ();
#endif #endif
} }
#ifdef NM_LOGGING_H #ifdef __NETWORKMANAGER_LOGGING_H__
inline static void inline static void
nmtst_init_with_logging (int *argc, char ***argv, const char *log_level, const char *log_domains) 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 ...@@ -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 * inline static NMPlatformIP6Address *
nmtst_platform_ip6_address (const char *address, const char *peer_address, guint plen) 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 ...@@ -649,7 +649,7 @@ nmtst_platform_ip6_routes_equal (const NMPlatformIP6Route *a, const NMPlatformIP
#endif #endif
#ifdef NM_IP4_CONFIG_H #ifdef __NETWORKMANAGER_IP4_CONFIG_H__
inline static NMIP4Config * inline static NMIP4Config *
nmtst_ip4_config_clone (NMIP4Config *config) nmtst_ip4_config_clone (NMIP4Config *config)
...@@ -665,7 +665,7 @@ nmtst_ip4_config_clone (NMIP4Config *config) ...@@ -665,7 +665,7 @@ nmtst_ip4_config_clone (NMIP4Config *config)
#endif #endif
#ifdef NM_IP6_CONFIG_H #ifdef __NETWORKMANAGER_IP6_CONFIG_H__
inline static NMIP6Config * inline static NMIP6Config *
nmtst_ip6_config_clone (NMIP6Config *config) nmtst_ip6_config_clone (NMIP6Config *config)
...@@ -680,7 +680,7 @@ nmtst_ip6_config_clone (NMIP6Config *config) ...@@ -680,7 +680,7 @@ nmtst_ip6_config_clone (NMIP6Config *config)
#endif #endif
#ifdef NM_CONNECTION_H #ifdef __NM_CONNECTION_H__
inline static NMConnection * inline static NMConnection *
nmtst_create_minimal_connection (const char *id, const char *uuid, const char *type, NMSettingConnection **out_s_con) nmtst_create_minimal_connection (const char *id, const char *uuid, const char *type, NMSettingConnection **out_s_con)
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc. * Copyright 2007 - 2008 Novell, Inc.
*/ */
#ifndef NM_CONNECTION_H #ifndef __NM_CONNECTION_H__
#define NM_CONNECTION_H #define __NM_CONNECTION_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -251,4 +251,4 @@ NMSettingVlan * nm_connection_get_setting_vlan (NMConnec ...@@ -251,4 +251,4 @@ NMSettingVlan * nm_connection_get_setting_vlan (NMConnec
G_END_DECLS G_END_DECLS
#endif /* NM_CONNECTION_H */ #endif /* __NM_CONNECTION_H__ */
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* used by some external code that does not link to libnm. * used by some external code that does not link to libnm.
*/ */
#ifndef NM_DBUS_INTERFACE_H #ifndef __NM_DBUS_INTERFACE_H__
#define NM_DBUS_INTERFACE_H #define __NM_DBUS_INTERFACE_H__
#include "nm-version.h" #include "nm-version.h"
...@@ -607,4 +607,4 @@ typedef enum /*< flags >*/ { ...@@ -607,4 +607,4 @@ typedef enum /*< flags >*/ {
NM_SECRET_AGENT_CAPABILITY_LAST = NM_SECRET_AGENT_CAPABILITY_VPN_HINTS NM_SECRET_AGENT_CAPABILITY_LAST = NM_SECRET_AGENT_CAPABILITY_VPN_HINTS
} NMSecretAgentCapabilities; } NMSecretAgentCapabilities;
#endif /* NM_DBUS_INTERFACE_H */ #endif /* __NM_DBUS_INTERFACE_H__ */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc. * Copyright 2007 - 2008 Novell, Inc.
*/ */
#ifndef NM_PARAM_SPEC_SPECIALIZED_H #ifndef __NM_PARAM_SPEC_SPECIALIZED_H__
#define NM_PARAM_SPEC_SPECIALIZED_H #define __NM_PARAM_SPEC_SPECIALIZED_H__
#include <glib-object.h> #include <glib-object.h>
...@@ -40,4 +40,4 @@ GParamSpec *_nm_param_spec_specialized (const char *name, ...@@ -40,4 +40,4 @@ GParamSpec *_nm_param_spec_specialized (const char *name,
GType specialized_type, GType specialized_type,
GParamFlags flags); GParamFlags flags);
#endif /* NM_PARAM_SPEC_SPECIALIZED_H */ #endif /* __NM_PARAM_SPEC_SPECIALIZED_H__ */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc. * Copyright 2007 - 2008 Novell, Inc.
*/ */
#ifndef NM_SETTING_8021X_H #ifndef __NM_SETTING_8021X_H__
#define NM_SETTING_8021X_H #define __NM_SETTING_8021X_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -292,4 +292,4 @@ NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format (NMSett ...@@ -292,4 +292,4 @@ NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format (NMSett
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_8021X_H */ #endif /* __NM_SETTING_8021X_H__ */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Copyright 2007 - 2008 Red Hat, Inc. * Copyright 2007 - 2008 Red Hat, Inc.
*/ */
#ifndef NM_SETTING_ADSL_H #ifndef __NM_SETTING_ADSL_H__
#define NM_SETTING_ADSL_H #define __NM_SETTING_ADSL_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -94,4 +94,4 @@ NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting) ...@@ -94,4 +94,4 @@ NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting)
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_ADSL_H */ #endif /* __NM_SETTING_ADSL_H__ */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc. * Copyright 2007 - 2008 Novell, Inc.
*/ */
#ifndef NM_SETTING_BLUETOOTH_H #ifndef __NM_SETTING_BLUETOOTH_H__
#define NM_SETTING_BLUETOOTH_H #define __NM_SETTING_BLUETOOTH_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -98,4 +98,4 @@ const char * nm_setting_bluetooth_get_connection_type (NMSettingBluetooth * ...@@ -98,4 +98,4 @@ const char * nm_setting_bluetooth_get_connection_type (NMSettingBluetooth *
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_BLUETOOTH_H */ #endif /* __NM_SETTING_BLUETOOTH_H__ */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc. * Copyright 2011 - 2013 Red Hat, Inc.
*/ */
#ifndef NM_SETTING_BOND_H #ifndef __NM_SETTING_BOND_H__
#define NM_SETTING_BOND_H #define __NM_SETTING_BOND_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -114,4 +114,4 @@ const char * nm_setting_bond_get_option_default (NMSettingBond *setting, ...@@ -114,4 +114,4 @@ const char * nm_setting_bond_get_option_default (NMSettingBond *setting,
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_BOND_H */ #endif /* __NM_SETTING_BOND_H__ */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Copyright 2012 Red Hat, Inc. * Copyright 2012 Red Hat, Inc.
*/ */
#ifndef NM_SETTING_BRIDGE_PORT_H #ifndef __NM_SETTING_BRIDGE_PORT_H__
#define NM_SETTING_BRIDGE_PORT_H #define __NM_SETTING_BRIDGE_PORT_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -82,4 +82,4 @@ gboolean nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *settin ...@@ -82,4 +82,4 @@ gboolean nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *settin
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_BRIDGE_PORT_H */ #endif /* __NM_SETTING_BRIDGE_PORT_H__ */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Copyright 2011 - 2012 Red Hat, Inc. * Copyright 2011 - 2012 Red Hat, Inc.
*/ */
#ifndef NM_SETTING_BRIDGE_H #ifndef __NM_SETTING_BRIDGE_H__
#define NM_SETTING_BRIDGE_H #define __NM_SETTING_BRIDGE_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -97,4 +97,4 @@ guint32 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting); ...@@ -97,4 +97,4 @@ guint32 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_BRIDGE_H */ #endif /* __NM_SETTING_BRIDGE_H__ */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc. * Copyright 2007 - 2008 Novell, Inc.
*/ */
#ifndef NM_SETTING_CDMA_H #ifndef __NM_SETTING_CDMA_H__
#define NM_SETTING_CDMA_H #define __NM_SETTING_CDMA_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -85,4 +85,4 @@ NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting) ...@@ -85,4 +85,4 @@ NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting)
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_CDMA_H */ #endif /* __NM_SETTING_CDMA_H__ */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc. * Copyright 2007 - 2008 Novell, Inc.
*/ */
#ifndef NM_SETTING_CONNECTION_H #ifndef __NM_SETTING_CONNECTION_H__
#define NM_SETTING_CONNECTION_H #define __NM_SETTING_CONNECTION_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -145,4 +145,4 @@ guint32 nm_setting_connection_get_gateway_ping_timeout (NMSettingConnection ...@@ -145,4 +145,4 @@ guint32 nm_setting_connection_get_gateway_ping_timeout (NMSettingConnection
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_CONNECTION_H */ #endif /* __NM_SETTING_CONNECTION_H__ */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Copyright 2013 Red Hat, Inc. * Copyright 2013 Red Hat, Inc.
*/ */
#ifndef NM_SETTING_DCB_H #ifndef __NM_SETTING_DCB_H__
#define NM_SETTING_DCB_H #define __NM_SETTING_DCB_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -177,4 +177,4 @@ void nm_setting_dcb_set_priority_traffic_class (NMSettingDcb *setting, ...@@ -177,4 +177,4 @@ void nm_setting_dcb_set_priority_traffic_class (NMSettingDcb *setting,
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_DCB_H */ #endif /* __NM_SETTING_DCB_H__ */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Copyright 2013 Red Hat, Inc. * Copyright 2013 Red Hat, Inc.
*/ */
#ifndef NM_SETTING_GENERIC_H #ifndef __NM_SETTING_GENERIC_H__
#define NM_SETTING_GENERIC_H #define __NM_SETTING_GENERIC_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -72,4 +72,4 @@ NMSetting * nm_setting_generic_new (void); ...@@ -72,4 +72,4 @@ NMSetting * nm_setting_generic_new (void);
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_GENERIC_H */ #endif /* __NM_SETTING_GENERIC_H__ */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc. * Copyright 2007 - 2008 Novell, Inc.
*/ */
#ifndef NM_SETTING_GSM_H #ifndef __NM_SETTING_GSM_H__
#define NM_SETTING_GSM_H #define __NM_SETTING_GSM_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -100,4 +100,4 @@ NMSettingSecretFlags nm_setting_gsm_get_password_flags (NMSettingGsm *setting); ...@@ -100,4 +100,4 @@ NMSettingSecretFlags nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_GSM_H */ #endif /* __NM_SETTING_GSM_H__ */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Copyright 2011 Red Hat, Inc. * Copyright 2011 Red Hat, Inc.
*/ */
#ifndef NM_SETTING_INFINIBAND_H #ifndef __NM_SETTING_INFINIBAND_H__
#define NM_SETTING_INFINIBAND_H #define __NM_SETTING_INFINIBAND_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -83,4 +83,4 @@ const char * nm_setting_infiniband_get_parent (NMSettingInfiniband ...@@ -83,4 +83,4 @@ const char * nm_setting_infiniband_get_parent (NMSettingInfiniband
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_INFINIBAND_H */ #endif /* __NM_SETTING_INFINIBAND_H__ */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc. * Copyright 2007 - 2008 Novell, Inc.
*/ */
#ifndef NM_SETTING_IP4_CONFIG_H #ifndef __NM_SETTING_IP4_CONFIG_H__
#define NM_SETTING_IP4_CONFIG_H #define __NM_SETTING_IP4_CONFIG_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -223,4 +223,4 @@ gboolean nm_setting_ip4_config_get_may_fail (NMSettingIP4Config * ...@@ -223,4 +223,4 @@ gboolean nm_setting_ip4_config_get_may_fail (NMSettingIP4Config *
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_IP4_CONFIG_H */ #endif /* __NM_SETTING_IP4_CONFIG_H__ */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Copyright 2007 - 2014 Red Hat, Inc. * Copyright 2007 - 2014 Red Hat, Inc.
*/ */
#ifndef NM_SETTING_IP6_CONFIG_H #ifndef __NM_SETTING_IP6_CONFIG_H__
#define NM_SETTING_IP6_CONFIG_H #define __NM_SETTING_IP6_CONFIG_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly." #error "Only <NetworkManager.h> can be included directly."
...@@ -250,4 +250,4 @@ NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Con ...@@ -250,4 +250,4 @@ NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Con
G_END_DECLS G_END_DECLS
#endif /* NM_SETTING_IP6_CONFIG_H */ #endif /* __NM_SETTING_IP6_CONFIG_H__ */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Copyright 2009 One Laptop per Child * Copyright 2009 One Laptop per Child
*/