diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-08-11 18:10:43 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-08-22 15:22:16 +0200 |
| commit | 8fe1b790126f433e8b9d05b3385e7075b6af68ae (patch) | |
| tree | e46074cb246b0a7379702b0c26702f29cad846fc | |
| parent | ef32da01fa0b9e02ccae476bea412ff025091a7f (diff) | |
| download | NetworkManager-8fe1b790126f433e8b9d05b3385e7075b6af68ae.tar.gz | |
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 <thaller@redhat.com>
| -rw-r--r-- | libnm-core/nm-core-internal.h | 7 | ||||
| -rw-r--r-- | libnm-core/nm-setting-private.h | 9 | ||||
| -rw-r--r-- | src/NetworkManagerUtils.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 41b51c2f69..9437bbd3a3 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -45,5 +45,12 @@ gboolean _nm_setting_ip4_config_add_address_with_label (NMSettingIP4Config *s NMIP4Address *address, const char *label); +/* 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 + #endif 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 diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index fc85b0040c..6f3d8b6635 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -33,7 +33,7 @@ #include "NetworkManagerUtils.h" #include "nm-utils.h" -#include "nm-setting-private.h" +#include "nm-core-internal.h" #include "nm-logging.h" #include "nm-device.h" #include "nm-setting-connection.h" |