Merge branch 'main' into 'main'

gio/tests/cxx.cpp: fix missing sentinel for musl

See merge request GNOME/glib!3294
This commit is contained in:
Philip Withnall 2023-02-23 14:53:20 +00:00
commit 35c9ab144e

View File

@ -58,7 +58,11 @@ test_name_macro_wrapper (void)
int
main (int argc, char **argv)
{
#if G_CXX_STD_CHECK_VERSION (11)
g_test_init (&argc, &argv, NULL);
#else
g_test_init (&argc, &argv, static_cast<void *>(NULL));
#endif
g_test_add_func ("/gtask/name", test_name);
g_test_add_func ("/gtask/name/macro-wrapper", test_name_macro_wrapper);