From aafc1dbe4712c86189bbc1d4d54ad8cb4c69be7e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 5 Oct 2020 22:27:18 +0200 Subject: New upstream version 1.27.90 --- shared/nm-utils/nm-compat.h | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'shared/nm-utils/nm-compat.h') diff --git a/shared/nm-utils/nm-compat.h b/shared/nm-utils/nm-compat.h index 55f764c7..fb136a5b 100644 --- a/shared/nm-utils/nm-compat.h +++ b/shared/nm-utils/nm-compat.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2017 Red Hat, Inc. */ @@ -8,30 +8,28 @@ #include "nm-setting-vpn.h" -const char **_nm_setting_vpn_get_data_keys (NMSettingVpn *setting, - guint *out_length); +const char **_nm_setting_vpn_get_data_keys(NMSettingVpn *setting, guint *out_length); -const char **_nm_setting_vpn_get_secret_keys (NMSettingVpn *setting, - guint *out_length); +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 \ - }) +#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 \ + }) #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 #endif /* __NM_COMPAT_H__ */ -- cgit 1.3.0-6-gf8a5