Commit 751feb91 authored by Allison Karlitskaya's avatar Allison Karlitskaya

Bug 612502 - build fails on glib/tests/gvariant.c

Fix two problems caught by Tim Rice.

  - non-constant expression used as array size
  - arithmetic on void *
parent 1953b408
......@@ -1251,7 +1251,7 @@ flavoured_malloc (gsize size, gsize flavour)
if (size == 0)
return NULL;
return g_malloc (size + flavour) + flavour;
return ((gchar *) g_malloc (size + flavour)) + flavour;
}
static void
......@@ -3341,8 +3341,7 @@ test_builder_memory (void)
static void
test_hashing (void)
{
const gint n_items = 4096;
GVariant *items[n_items];
GVariant *items[4096];
GHashTable *table;
gint i;
......@@ -3350,7 +3349,7 @@ test_hashing (void)
(GDestroyNotify ) g_variant_unref,
NULL);
for (i = 0; i < n_items; i++)
for (i = 0; i < G_N_ELEMENTS (items); i++)
{
TreeInstance *tree;
gint j;
......@@ -3372,7 +3371,7 @@ test_hashing (void)
GINT_TO_POINTER (i));
}
for (i = 0; i < n_items; i++)
for (i = 0; i < G_N_ELEMENTS (items); i++)
{
gpointer result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment