Unverified Commit 4e109bac authored by Thomas Haller's avatar Thomas Haller
Browse files

clang-format: use "IndentPPDirectives:None" instead of "BeforeHash"

Subjectively, I think this looks better.
parent dedd2286
Pipeline #356245 passed with stages
in 50 minutes and 14 seconds
......@@ -44,7 +44,7 @@ BreakStringLiterals: true
IncludeBlocks: Preserve
IndentCaseLabels: false
IndentGotoLabels: false
IndentPPDirectives: BeforeHash
IndentPPDirectives: None
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false
MaxEmptyLinesToKeep: 1
......
......@@ -15,23 +15,23 @@ const char **_nm_setting_vpn_get_data_keys(NMSettingVpn *setting, guint *out_len
const char **_nm_setting_vpn_get_secret_keys(NMSettingVpn *setting, guint *out_length);
#if NM_CHECK_VERSION(1, 11, 0)
#define nm_setting_vpn_get_data_keys(setting, out_length) \
({ \
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
nm_setting_vpn_get_data_keys(setting, out_length); \
G_GNUC_END_IGNORE_DEPRECATIONS \
})
#define nm_setting_vpn_get_secret_keys(setting, out_length) \
({ \
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
nm_setting_vpn_get_secret_keys(setting, out_length); \
G_GNUC_END_IGNORE_DEPRECATIONS \
})
#define nm_setting_vpn_get_data_keys(setting, out_length) \
({ \
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
nm_setting_vpn_get_data_keys(setting, out_length); \
G_GNUC_END_IGNORE_DEPRECATIONS \
})
#define nm_setting_vpn_get_secret_keys(setting, out_length) \
({ \
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
nm_setting_vpn_get_secret_keys(setting, out_length); \
G_GNUC_END_IGNORE_DEPRECATIONS \
})
#else
#define nm_setting_vpn_get_data_keys(setting, out_length) \
_nm_setting_vpn_get_data_keys(setting, out_length)
#define nm_setting_vpn_get_secret_keys(setting, out_length) \
_nm_setting_vpn_get_secret_keys(setting, out_length)
#define nm_setting_vpn_get_data_keys(setting, out_length) \
_nm_setting_vpn_get_data_keys(setting, out_length)
#define nm_setting_vpn_get_secret_keys(setting, out_length) \
_nm_setting_vpn_get_secret_keys(setting, out_length)
#endif
/*****************************************************************************/
......@@ -39,15 +39,15 @@ const char **_nm_setting_vpn_get_secret_keys(NMSettingVpn *setting, guint *out_l
/* possibly missing defines from newer libnm API. */
#ifndef NM_VPN_PLUGIN_CONFIG_PROXY_PAC
#define NM_VPN_PLUGIN_CONFIG_PROXY_PAC "pac"
#define NM_VPN_PLUGIN_CONFIG_PROXY_PAC "pac"
#endif
#ifndef NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES
#define NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES "preserve-routes"
#define NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES "preserve-routes"
#endif
#ifndef NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES
#define NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES "preserve-routes"
#define NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES "preserve-routes"
#endif
/*****************************************************************************/
......
......@@ -31,9 +31,9 @@
/*****************************************************************************/
#if WITH_BLUEZ5_DUN
#define _NM_BT_CAPABILITY_SUPPORTED_DUN NM_BT_CAPABILITY_DUN
#define _NM_BT_CAPABILITY_SUPPORTED_DUN NM_BT_CAPABILITY_DUN
#else
#define _NM_BT_CAPABILITY_SUPPORTED_DUN NM_BT_CAPABILITY_NONE
#define _NM_BT_CAPABILITY_SUPPORTED_DUN NM_BT_CAPABILITY_NONE
#endif
#define _NM_BT_CAPABILITY_SUPPORTED (NM_BT_CAPABILITY_NAP | _NM_BT_CAPABILITY_SUPPORTED_DUN)
......
......@@ -9,15 +9,13 @@
#include "nm-device.h"
#if !_NM_CC_SUPPORT_GENERIC
#define _NM_DEVICE_CAST(self) ((NMDevice *) (self))
#define _NM_DEVICE_CAST(self) ((NMDevice *) (self))
#elif !defined(_NMLOG_DEVICE_TYPE)
#define _NM_DEVICE_CAST(self) \
_Generic((self), NMDevice * \
: ((NMDevice *) (self)), NMDevice *const \
: ((NMDevice *) (self)))
#define _NM_DEVICE_CAST(self) \
_Generic((self), NMDevice * : ((NMDevice *) (self)), NMDevice *const : ((NMDevice *) (self)))
#else
#define _NM_DEVICE_CAST(self) \
_Generic((self), \
#define _NM_DEVICE_CAST(self) \
_Generic((self), \
_NMLOG_DEVICE_TYPE * : ((NMDevice *) (self)), \
_NMLOG_DEVICE_TYPE * const: ((NMDevice *) (self)), \
NMDevice * : ((NMDevice *) (self)), \
......
......@@ -25,7 +25,7 @@
/*****************************************************************************/
#if JANSSON_VERSION_HEX < 0x020400
#warning "requires at least libjansson 2.4"
#warning "requires at least libjansson 2.4"
#endif
typedef struct {
......
......@@ -13,7 +13,7 @@
#include "nm-dbus-manager.h"
#if WITH_IWD
#include "nm-device-iwd.h"
#include "nm-device-iwd.h"
#endif
/*****************************************************************************/
......
......@@ -12,9 +12,9 @@
#include <libmm-glib.h>
#if HAVE_LIBSYSTEMD
#include <systemd/sd-daemon.h>
#include <systemd/sd-daemon.h>
#else
#define sd_booted() FALSE
#define sd_booted() FALSE
#endif
#include "libnm-std-aux/nm-dbus-compat.h"
......@@ -22,7 +22,7 @@
#include "nm-modem-broadband.h"
#if WITH_OFONO
#include "nm-modem-ofono.h"
#include "nm-modem-ofono.h"
#endif
#define MODEM_POKE_INTERVAL 120
......
......@@ -14,21 +14,21 @@
#if WITH_DHCLIENT
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <ctype.h>
#include "libnm-glib-aux/nm-dedup-multi.h"
#include "nm-utils.h"
#include "nm-dhcp-dhclient-utils.h"
#include "nm-dhcp-manager.h"
#include "NetworkManagerUtils.h"
#include "nm-dhcp-listener.h"
#include "nm-dhcp-client-logging.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <ctype.h>
#include "libnm-glib-aux/nm-dedup-multi.h"
#include "nm-utils.h"
#include "nm-dhcp-dhclient-utils.h"
#include "nm-dhcp-manager.h"
#include "NetworkManagerUtils.h"
#include "nm-dhcp-listener.h"
#include "nm-dhcp-client-logging.h"
/*****************************************************************************/
......@@ -41,16 +41,15 @@ _addr_family_to_path_part(int addr_family)
/*****************************************************************************/
#define NM_TYPE_DHCP_DHCLIENT (nm_dhcp_dhclient_get_type())
#define NM_DHCP_DHCLIENT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclient))
#define NM_DHCP_DHCLIENT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
#define NM_IS_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCLIENT))
#define NM_IS_DHCP_DHCLIENT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCLIENT))
#define NM_DHCP_DHCLIENT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
#define NM_TYPE_DHCP_DHCLIENT (nm_dhcp_dhclient_get_type())
#define NM_DHCP_DHCLIENT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclient))
#define NM_DHCP_DHCLIENT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
#define NM_IS_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCLIENT))
#define NM_IS_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCLIENT))
#define NM_DHCP_DHCLIENT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
typedef struct _NMDhcpDhclient NMDhcpDhclient;
typedef struct _NMDhcpDhclientClass NMDhcpDhclientClass;
......@@ -78,8 +77,8 @@ struct _NMDhcpDhclientClass {
G_DEFINE_TYPE(NMDhcpDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT)
#define NM_DHCP_DHCLIENT_GET_PRIVATE(self) \
_NM_GET_PRIVATE(self, NMDhcpDhclient, NM_IS_DHCP_DHCLIENT)
#define NM_DHCP_DHCLIENT_GET_PRIVATE(self) \
_NM_GET_PRIVATE(self, NMDhcpDhclient, NM_IS_DHCP_DHCLIENT)
/*****************************************************************************/
......
......@@ -7,25 +7,24 @@
#if WITH_DHCPCANON
#include <stdlib.h>
#include <unistd.h>
#include "nm-utils.h"
#include "nm-dhcp-manager.h"
#include "NetworkManagerUtils.h"
#include "nm-dhcp-listener.h"
#include "nm-dhcp-client-logging.h"
#define NM_TYPE_DHCP_DHCPCANON (nm_dhcp_dhcpcanon_get_type())
#define NM_DHCP_DHCPCANON(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanon))
#define NM_DHCP_DHCPCANON_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
#define NM_IS_DHCP_DHCPCANON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCANON))
#define NM_IS_DHCP_DHCPCANON_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCANON))
#define NM_DHCP_DHCPCANON_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
#include <stdlib.h>
#include <unistd.h>
#include "nm-utils.h"
#include "nm-dhcp-manager.h"
#include "NetworkManagerUtils.h"
#include "nm-dhcp-listener.h"
#include "nm-dhcp-client-logging.h"
#define NM_TYPE_DHCP_DHCPCANON (nm_dhcp_dhcpcanon_get_type())
#define NM_DHCP_DHCPCANON(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanon))
#define NM_DHCP_DHCPCANON_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
#define NM_IS_DHCP_DHCPCANON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCANON))
#define NM_IS_DHCP_DHCPCANON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCANON))
#define NM_DHCP_DHCPCANON_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
typedef struct _NMDhcpDhcpcanon NMDhcpDhcpcanon;
typedef struct _NMDhcpDhcpcanonClass NMDhcpDhcpcanonClass;
......@@ -53,8 +52,8 @@ struct _NMDhcpDhcpcanonClass {
G_DEFINE_TYPE(NMDhcpDhcpcanon, nm_dhcp_dhcpcanon, NM_TYPE_DHCP_CLIENT)
#define NM_DHCP_DHCPCANON_GET_PRIVATE(self) \
_NM_GET_PRIVATE(self, NMDhcpDhcpcanon, NM_IS_DHCP_DHCPCANON)
#define NM_DHCP_DHCPCANON_GET_PRIVATE(self) \
_NM_GET_PRIVATE(self, NMDhcpDhcpcanon, NM_IS_DHCP_DHCPCANON)
/*****************************************************************************/
......
......@@ -8,29 +8,28 @@
#if WITH_DHCPCD
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include "nm-dhcp-manager.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-dhcp-listener.h"
#include "nm-dhcp-client-logging.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include "nm-dhcp-manager.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-dhcp-listener.h"
#include "nm-dhcp-client-logging.h"
/*****************************************************************************/
#define NM_TYPE_DHCP_DHCPCD (nm_dhcp_dhcpcd_get_type())
#define NM_DHCP_DHCPCD(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd))
#define NM_DHCP_DHCPCD_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
#define NM_IS_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCD))
#define NM_IS_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCD))
#define NM_DHCP_DHCPCD_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
#define NM_TYPE_DHCP_DHCPCD (nm_dhcp_dhcpcd_get_type())
#define NM_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd))
#define NM_DHCP_DHCPCD_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
#define NM_IS_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCD))
#define NM_IS_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCD))
#define NM_DHCP_DHCPCD_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
typedef struct _NMDhcpDhcpcd NMDhcpDhcpcd;
typedef struct _NMDhcpDhcpcdClass NMDhcpDhcpcdClass;
......@@ -54,7 +53,7 @@ struct _NMDhcpDhcpcdClass {
G_DEFINE_TYPE(NMDhcpDhcpcd, nm_dhcp_dhcpcd, NM_TYPE_DHCP_CLIENT)
#define NM_DHCP_DHCPCD_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDhcpDhcpcd, NM_IS_DHCP_DHCPCD)
#define NM_DHCP_DHCPCD_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDhcpDhcpcd, NM_IS_DHCP_DHCPCD)
/*****************************************************************************/
......
......@@ -16,9 +16,9 @@
/*****************************************************************************/
#if NM_MORE_LOGGING
#define _NMLOG_ENABLED(level) TRUE
#define _NMLOG_ENABLED(level) TRUE
#else
#define _NMLOG_ENABLED(level) ((level) <= LOG_ERR)
#define _NMLOG_ENABLED(level) ((level) <= LOG_ERR)
#endif
#define _NMLOG(always_enabled, level, ...) \
......
......@@ -19,7 +19,7 @@
#include <linux/fs.h>
#if WITH_LIBPSL
#include <libpsl.h>
#include <libpsl.h>
#endif
#include "libnm-glib-aux/nm-str-buf.h"
......@@ -42,17 +42,17 @@
#define HASH_LEN NM_UTILS_CHECKSUM_LENGTH_SHA1
#ifndef RESOLVCONF_PATH
#define RESOLVCONF_PATH "/sbin/resolvconf"
#define HAS_RESOLVCONF 0
#define RESOLVCONF_PATH "/sbin/resolvconf"
#define HAS_RESOLVCONF 0
#else
#define HAS_RESOLVCONF 1
#define HAS_RESOLVCONF 1
#endif
#ifndef NETCONFIG_PATH
#define NETCONFIG_PATH "/sbin/netconfig"
#define HAS_NETCONFIG 0
#define NETCONFIG_PATH "/sbin/netconfig"
#define HAS_NETCONFIG 0
#else
#define HAS_NETCONFIG 1
#define HAS_NETCONFIG 1
#endif
/*****************************************************************************/
......
......@@ -38,7 +38,7 @@
#include "nm-netns.h"
#if !defined(NM_DIST_VERSION)
#define NM_DIST_VERSION VERSION
#define NM_DIST_VERSION VERSION
#endif
#define NM_DEFAULT_PID_FILE NMRUNDIR "/NetworkManager.pid"
......
......@@ -8,7 +8,7 @@
#include "nm-audit-manager.h"
#if HAVE_LIBAUDIT
#include <libaudit.h>
#include <libaudit.h>
#endif
#define NM_VALUE_TYPE_DEFINE_FUNCTIONS
......
......@@ -10,7 +10,7 @@
#include "nm-connectivity.h"
#if WITH_CONCHECK
#include <curl/curl.h>
#include <curl/curl.h>
#endif
#include <linux/rtnetlink.h>
......
......@@ -39,8 +39,8 @@
#include "nm-setting-wireless-security.h"
#ifdef __NM_SD_UTILS_H__
#error \
"nm-core-utils.c should stay independent of systemd utils. Are you looking for NetworkMangerUtils.c? "
#error \
"nm-core-utils.c should stay independent of systemd utils. Are you looking for NetworkMangerUtils.c? "
#endif
G_STATIC_ASSERT(sizeof(NMUtilsTestFlags) <= sizeof(int));
......
......@@ -40,7 +40,7 @@ void _nm_singleton_instance_register_destruction(GObject *instance);
/* By default, the getter will assert that the singleton will be created only once. You can
* change this by redefining NM_DEFINE_SINGLETON_ALLOW_MULTIPLE. */
#ifndef NM_DEFINE_SINGLETON_ALLOW_MULTIPLE
#define NM_DEFINE_SINGLETON_ALLOW_MULTIPLE FALSE
#define NM_DEFINE_SINGLETON_ALLOW_MULTIPLE FALSE
#endif
#define NM_DEFINE_SINGLETON_GETTER(TYPE, GETTER, GTYPE, ...) \
......
......@@ -10,8 +10,8 @@
#include <sys/stat.h>
#if HAVE_SELINUX
#include <selinux/selinux.h>
#include <selinux/label.h>
#include <selinux/selinux.h>
#include <selinux/label.h>
#endif
#include "libnm-core-aux-intern/nm-common-macros.h"
......@@ -37,17 +37,17 @@
#if (defined(HOSTNAME_PERSIST_SUSE) + defined(HOSTNAME_PERSIST_SLACKWARE) \
+ defined(HOSTNAME_PERSIST_GENTOO)) \
> 1
#error "Can only define one of HOSTNAME_PERSIST_*"
#error "Can only define one of HOSTNAME_PERSIST_*"
#endif
#if defined(HOSTNAME_PERSIST_SUSE)
#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME
#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME
#elif defined(HOSTNAME_PERSIST_SLACKWARE)
#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME
#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME
#elif defined(HOSTNAME_PERSIST_GENTOO)
#define HOSTNAME_FILE HOSTNAME_FILE_GENTOO
#define HOSTNAME_FILE HOSTNAME_FILE_GENTOO
#else
#define HOSTNAME_FILE HOSTNAME_FILE_DEFAULT
#define HOSTNAME_FILE HOSTNAME_FILE_DEFAULT
#endif
/*****************************************************************************/
......
......@@ -30,7 +30,7 @@
#include "libnm-systemd-core/nm-sd.h"
#if !defined(NM_DIST_VERSION)
#define NM_DIST_VERSION VERSION
#define NM_DIST_VERSION VERSION
#endif
#define NMIH_PID_FILE_FMT NMRUNDIR "/nm-iface-helper-%d.pid"
......
......@@ -275,7 +275,7 @@ NM_IS_IP_CONFIG_ADDR_FAMILY(gconstpointer config, int addr_family)
}
#if _NM_CC_SUPPORT_GENERIC
/* _NM_IS_IP_CONFIG() is a bit unusual. If _Generic() is supported,
/* _NM_IS_IP_CONFIG() is a bit unusual. If _Generic() is supported,
* it checks whether @config is either NM_IS_IP4_CONFIG() or NM_IS_IP6_CONFIG(),
* depending on the pointer type of @config.
*
......@@ -286,10 +286,10 @@ NM_IS_IP_CONFIG_ADDR_FAMILY(gconstpointer config, int addr_family)
* NMIP4Config *ptr = nm_ip4_config_new(...);
* g_assert (_NM_IS_IP_CONFIG (ptr, ptr));
*/
#define _NM_IS_IP_CONFIG(typeexpr, config) \
({ \
const void *const _config = (config); \
_Generic ((typeexpr), \
#define _NM_IS_IP_CONFIG(typeexpr, config) \
({ \
const void *const _config = (config); \
_Generic ((typeexpr), \
const void *const: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
const void * : (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
void *const: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
......@@ -306,9 +306,9 @@ NM_IS_IP_CONFIG_ADDR_FAMILY(gconstpointer config, int addr_family)
const NMIP6Config * : (NM_IS_IP6_CONFIG (_config)), \
NMIP6Config *const: (NM_IS_IP6_CONFIG (_config)), \
NMIP6Config * : (NM_IS_IP6_CONFIG (_config))); \
})
})
#else
#define _NM_IS_IP_CONFIG(typeexpr, config) NM_IS_IP_CONFIG(config)
#define _NM_IS_IP_CONFIG(typeexpr, config) NM_IS_IP_CONFIG(config)
#endif
#define NM_IP_CONFIG_CAST(config) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment