Merge branch 'fix_warnings' into 'main'

Fix several cosmetic warnings

Closes #2559

See merge request GNOME/glib!2401
This commit is contained in:
Philip Withnall 2021-12-23 12:51:19 +00:00
commit ca6cf3c64a
2 changed files with 3 additions and 1 deletions

View File

@ -1185,6 +1185,7 @@ g_object_real_dispose (GObject *object)
g_datalist_id_set_data (&object->qdata, quark_weak_locations, NULL); g_datalist_id_set_data (&object->qdata, quark_weak_locations, NULL);
} }
#ifdef G_ENABLE_DEBUG
static gboolean static gboolean
floating_check (GObject *object) floating_check (GObject *object)
{ {
@ -1202,6 +1203,7 @@ floating_check (GObject *object)
return FALSE; return FALSE;
} }
#endif
static void static void
g_object_finalize (GObject *object) g_object_finalize (GObject *object)

View File

@ -28,7 +28,7 @@ static gboolean want_corruption = FALSE;
/* --- old memchunk prototypes (memchunks.c) --- */ /* --- old memchunk prototypes (memchunks.c) --- */
GMemChunk* old_mem_chunk_new (const gchar *name, GMemChunk* old_mem_chunk_new (const gchar *name,
gint atom_size, gulong atom_size,
gulong area_size, gulong area_size,
gint type); gint type);
void old_mem_chunk_destroy (GMemChunk *mem_chunk); void old_mem_chunk_destroy (GMemChunk *mem_chunk);