summaryrefslogtreecommitdiff
path: root/shared/nm-utils/nm-dedup-multi.c
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-01-02 15:47:37 +0100
committerLubomir Rintel <lkundrak@v3.sk>2018-01-18 11:45:36 +0100
commit8a46b25cfa8c33daa8af37bb8103ca02286001b1 (patch)
tree1725f84d8c42af42d1153aeaa71e63be8854bc93 /shared/nm-utils/nm-dedup-multi.c
parent1443bf77e8cefc6f2d49f1e7f4140155ad73551b (diff)
downloadNetworkManager-8a46b25cfa8c33daa8af37bb8103ca02286001b1.tar.gz
all: require glib 2.40lr/glib-2-40
RHEL 7.1 and Ubuntu 14.04 LTS both have this. https://bugzilla.gnome.org/show_bug.cgi?id=792323
Diffstat (limited to 'shared/nm-utils/nm-dedup-multi.c')
-rw-r--r--shared/nm-utils/nm-dedup-multi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shared/nm-utils/nm-dedup-multi.c b/shared/nm-utils/nm-dedup-multi.c
index ee310a7b1b..a0944f4699 100644
--- a/shared/nm-utils/nm-dedup-multi.c
+++ b/shared/nm-utils/nm-dedup-multi.c
@@ -386,10 +386,10 @@ _add (NMDedupMultiIndex *self,
head_entry->len++;
if ( add_head_entry
- && !nm_g_hash_table_add (self->idx_entries, head_entry))
+ && !g_hash_table_add (self->idx_entries, head_entry))
nm_assert_not_reached ();
- if (!nm_g_hash_table_add (self->idx_entries, entry))
+ if (!g_hash_table_add (self->idx_entries, entry))
nm_assert_not_reached ();
NM_SET_OUT (out_entry, entry);
@@ -870,7 +870,7 @@ nm_dedup_multi_index_obj_intern (NMDedupMultiIndex *self,
nm_assert (obj_new);
nm_assert (!obj_new->_multi_idx);
- if (!nm_g_hash_table_add (self->idx_objs, (gpointer) obj_new))
+ if (!g_hash_table_add (self->idx_objs, (gpointer) obj_new))
nm_assert_not_reached ();
((NMDedupMultiObj *) obj_new)->_multi_idx = self;