Merge branch 'wroy-main-patch-88172' into 'main'

Fix g_array_append_val compilation on Windows

Closes #2845

See merge request GNOME/glib!3150
This commit is contained in:
Philip Withnall 2022-12-17 23:23:58 +00:00
commit 3ec55201d0

View File

@ -64,7 +64,7 @@ struct _GPtrArray
* order by moving the last element to the position of the removed. * order by moving the last element to the position of the removed.
*/ */
#if defined (glib_typeof) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_76 #if defined (glib_typeof) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_76 && defined (__GNUC__)
#define g_array_append_val(a, v) \ #define g_array_append_val(a, v) \
(G_GNUC_EXTENSION ({ \ (G_GNUC_EXTENSION ({ \
glib_typeof ((v)) gaa_val_ = (v); \ glib_typeof ((v)) gaa_val_ = (v); \