From 8fe1b790126f433e8b9d05b3385e7075b6af68ae Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 11 Aug 2014 18:10:43 +0200 Subject: libnm-core: declare NM_SETTING_COMPARE_FLAG_INFERRABLE flag in "nm-core-internal.h" As this flag is used by NM-core, move it to nm-core-internal.h header file. Signed-off-by: Thomas Haller --- libnm-core/nm-setting-private.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libnm-core/nm-setting-private.h') diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h index a31d0d7006..8fe798122a 100644 --- a/libnm-core/nm-setting-private.h +++ b/libnm-core/nm-setting-private.h @@ -24,6 +24,8 @@ #include "nm-setting.h" #include "nm-glib-compat.h" +#include "nm-core-internal.h" + #define NM_SETTING_SECRET_FLAGS_ALL \ (NM_SETTING_SECRET_FLAG_NONE | \ NM_SETTING_SECRET_FLAG_AGENT_OWNED | \ @@ -73,13 +75,6 @@ gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting, gpointer user_data); -/* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated - * connection can be replaced by a already-defined connection. This flag only - * takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE - * flag. - */ -#define NM_SETTING_COMPARE_FLAG_INFERRABLE 0x80000000 - /* The property of the #NMSetting should be considered during comparisons that * use the %NM_SETTING_COMPARE_FLAG_INFERRABLE flag. Properties that don't have * this flag, are ignored when doing an infrerrable comparison. This flag should -- cgit v1.2.1