From 784f9f7e9f7f7d6deca93fa54bbd524715d7180c Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 30 Jan 2023 17:20:44 +0100 Subject: [PATCH] core,libnm: move enum NMDnsIPConfigType The enum will be used outside of core/dns. (cherry picked from commit 8a4632b56a1050ae155fef473582cae713321bce) (cherry picked from commit b14268290ac4db8fa4839d6fb362ddef151039a4) --- src/core/dns/nm-dns-manager.h | 10 ---------- src/libnm-base/nm-base.h | 8 ++++++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/core/dns/nm-dns-manager.h b/src/core/dns/nm-dns-manager.h index 210f9f6cb3..b41bf1ccf2 100644 --- a/src/core/dns/nm-dns-manager.h +++ b/src/core/dns/nm-dns-manager.h @@ -12,16 +12,6 @@ #include "nm-setting-connection.h" #include "nm-dns-plugin.h" -typedef enum { - NM_DNS_IP_CONFIG_TYPE_REMOVED = -1, - - NM_DNS_IP_CONFIG_TYPE_DEFAULT = 0, - NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE, - NM_DNS_IP_CONFIG_TYPE_VPN, -} NMDnsIPConfigType; - -/*****************************************************************************/ - struct _NMDnsConfigData; struct _NMDnsManager; diff --git a/src/libnm-base/nm-base.h b/src/libnm-base/nm-base.h index ff062a18b8..86e943ee64 100644 --- a/src/libnm-base/nm-base.h +++ b/src/libnm-base/nm-base.h @@ -409,4 +409,12 @@ typedef struct { #define _NM_CRYPTO_ERROR _nm_crypto_error_quark() GQuark _nm_crypto_error_quark(void); +typedef enum { + NM_DNS_IP_CONFIG_TYPE_REMOVED = -1, + + NM_DNS_IP_CONFIG_TYPE_DEFAULT = 0, + NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE, + NM_DNS_IP_CONFIG_TYPE_VPN, +} NMDnsIPConfigType; + #endif /* __NM_LIBNM_BASE_H__ */