luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/chergert/fix-gvariant-compile' into 'main'

Browse Source 
glib/gvariant: fix compile error with GCC 14.0.1

See merge request GNOME/glib!3973
This commit is contained in:
Philip Withnall 2024-03-20 11:44:17 +00:00
commit e583a35096
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib/gvariant.c
View File

@ -3978,7 +3978,11 @@ g_variant_dict_new (GVariant *from_asv)
{ {
GVariantDict *dict; GVariantDict *dict;
dict = g_slice_alloc (sizeof (struct heap_dict)); /* We actually want to treat the allocation as a `struct heap_dict`, but the
* compiler will warn if it’s not at least as big as `struct GVariantDict`. */
G_STATIC_ASSERT (sizeof (GVariantDict) >= sizeof (struct heap_dict));
dict = g_malloc (sizeof (GVariantDict));
g_variant_dict_init (dict, from_asv); g_variant_dict_init (dict, from_asv);
GVHD(dict)->magic = GVHD_MAGIC; GVHD(dict)->magic = GVHD_MAGIC;
GVHD(dict)->ref_count = 1; GVHD(dict)->ref_count = 1;
@ -4331,7 +4335,7 @@ g_variant_dict_unref (GVariantDict *dict)
if (--GVHD(dict)->ref_count == 0) if (--GVHD(dict)->ref_count == 0)
{ {
g_variant_dict_clear (dict); g_variant_dict_clear (dict);
g_slice_free (struct heap_dict, (struct heap_dict *) dict); g_free_sized (dict, sizeof (GVariantDict));
} }
} }