Merge branch 'cast-error' into 'main'

gthread-win32: Fix conversion error from pointer to integer

See merge request GNOME/glib!2907
This commit is contained in:
Marco Trevisan 2022-09-20 15:26:15 +00:00
commit e53c68b52f

View File

@ -356,7 +356,7 @@ g_private_get_impl (GPrivate *key)
}
/* Ditto, due to the unlocked access on the fast path */
if (!g_atomic_pointer_compare_and_exchange (&key->p, NULL, impl))
if (!g_atomic_pointer_compare_and_exchange (&key->p, NULL, GUINT_TO_POINTER (impl)))
g_thread_abort (0, "g_private_get_impl(2)");
}
LeaveCriticalSection (&g_private_lock);