diff options
| author | Francesco Giudici <fgiudici@redhat.com> | 2017-12-22 19:19:46 +0100 |
|---|---|---|
| committer | Francesco Giudici <fgiudici@redhat.com> | 2017-12-23 02:00:58 +0100 |
| commit | 17669c8180eb4bc78b68409273389b52c1ba7e6d (patch) | |
| tree | 33e8544a756866050c77ab9e9d2be7bb56292b92 | |
| parent | a47a882522e5003cf9628ae3040111c43444cb81 (diff) | |
| download | NetworkManager-fg/json_symbol_clash.tar.gz | |
libnm-core: use the new safe macro to avoid clashing with libjson-glib.fg/json_symbol_clash
| -rw-r--r-- | libnm-core/nm-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index f845d14cdf..44261d4032 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -5165,7 +5165,7 @@ _nm_utils_team_link_watcher_from_json (json_t *json_element) g_return_val_if_fail (json_element, NULL); - json_object_foreach (json_element, j_key, j_val) { + nm_json_object_foreach (json_element, j_key, j_val) { if (nm_streq (j_key, "name")) { g_free (name); name = strdup (json_string_value (j_val)); @@ -5360,7 +5360,7 @@ _nm_utils_team_config_equal (const char *conf1, /* Only consider a given subset of nodes, others can change depending on * current state */ for (i = 0, json = json1; i < 2; i++, json = json2) { - json_object_foreach_safe (json, tmp, key, value) { + nm_json_object_foreach_safe (json, tmp, key, value) { if (!NM_IN_STRSET (key, "runner", "link_watch")) json_object_del (json, key); } |