summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw@src.gnome.org>2018-10-21 12:31:47 +0800
committerTing-Wei Lan <lantw@src.gnome.org>2019-07-06 00:55:32 +0800
commit46a33a077d1519dcab558841b076e6fbac6e84d9 (patch)
tree751ce0b19f257e77737ac7b696301eb4b4e890eb /tests
parent5c7b219d5bf66a6dc14c23caa4a2539904f4d0de (diff)
downloaddconf-46a33a077d1519dcab558841b076e6fbac6e84d9.tar.gz
build: Define GVDB_USE_WEAK_SYMBOLS to use weak bindings in gvdb
Fix linking with LLD by using weak symbols in gvdb, and update dconf code to make it compatible with gvdb upstream changes. Fixes https://gitlab.gnome.org/GNOME/dconf/issues/47
Diffstat (limited to 'tests')
-rw-r--r--tests/dconf-mock-gvdb.c2
-rw-r--r--tests/gvdb.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/dconf-mock-gvdb.c b/tests/dconf-mock-gvdb.c
index 4f58de1..174bd71 100644
--- a/tests/dconf-mock-gvdb.c
+++ b/tests/dconf-mock-gvdb.c
@@ -170,7 +170,7 @@ gvdb_table_list (GvdbTable *table,
gchar **
gvdb_table_get_names (GvdbTable *table,
- gint *length)
+ gsize *length)
{
if (length)
*length = 0;
diff --git a/tests/gvdb.c b/tests/gvdb.c
index d054067..765f4b8 100644
--- a/tests/gvdb.c
+++ b/tests/gvdb.c
@@ -35,8 +35,8 @@ test_reader_empty (void)
GError *error = NULL;
GvdbTable *table;
gchar **names;
- gint n_names;
- gint i;
+ gsize n_names;
+ gsize i;
table = gvdb_table_new (SRCDIR "/gvdbs/empty_gvdb", TRUE, &error);
g_assert_no_error (error);
@@ -85,7 +85,7 @@ verify_table (GvdbTable *table)
{
GVariant *value;
gchar **list;
- gint n_names;
+ gsize n_names;
gboolean has;
/* We could not normally expect these to be in a particular order but
@@ -221,7 +221,7 @@ test_nested (void)
GvdbTable *table;
GvdbTable *locks;
gchar **names;
- gint n_names;
+ gsize n_names;
gboolean has;
table = gvdb_table_new (SRCDIR "/gvdbs/nested_gvdb", TRUE, &error);
@@ -277,8 +277,8 @@ inspect_carefully (GvdbTable *table,
};
gint found_items;
gchar **names;
- gint n_names;
- gint i;
+ gsize n_names;
+ gsize i;
if (level > 100)
return;