Merge branch 'gwin32-avoid-g-return-macro' into 'main'

gwin32: Avoid use of function call with side effect in g_return_* macro

See merge request GNOME/glib!3365
This commit is contained in:
Philip Withnall 2023-04-06 13:51:38 +00:00
commit adcf017eb4

View File

@ -578,7 +578,9 @@ g_win32_check_windows_version (const gint major,
/* Check for Service Pack Version >= 0 */
g_return_val_if_fail (spver >= 0, FALSE);
g_return_val_if_fail (_g_win32_call_rtl_version (&osverinfo), FALSE);
if (!_g_win32_call_rtl_version (&osverinfo))
return FALSE;
/* check the OS and Service Pack Versions */
if (osverinfo.dwMajorVersion > (DWORD) major)