From e74c568b07b50b97873fb4ee1d776dedefbd54d6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 1 Oct 2021 23:05:04 +0200 Subject: New upstream version 1.32.12 --- shared/nm-utils/nm-compat.h | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 shared/nm-utils/nm-compat.h (limited to 'shared/nm-utils/nm-compat.h') diff --git a/shared/nm-utils/nm-compat.h b/shared/nm-utils/nm-compat.h deleted file mode 100644 index 559afd5d..00000000 --- a/shared/nm-utils/nm-compat.h +++ /dev/null @@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2017 Red Hat, Inc. - */ - -#ifndef __NM_COMPAT_H__ -#define __NM_COMPAT_H__ - -#include "nm-setting-vpn.h" - -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); - -#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) -#endif - -#endif /* __NM_COMPAT_H__ */ -- cgit 1.3.0-6-gf8a5