Merge branch 'backport-4078-clang-discarded-qualifiers-glib-2-80' into 'glib-2-80'

Backport !4078 “tests: Fix clang compilation failure due to unrecognised option in pragma” to glib-2-80

See merge request GNOME/glib!4079
This commit is contained in:
Michael Catanzaro 2024-05-16 23:59:09 +00:00
commit 197e2690ef
2 changed files with 3 additions and 1 deletions

View File

@ -602,7 +602,7 @@ vs2017-x64-static:
- _build/meson-logs
freebsd-13-x86_64:
extends: .only-origin-or-manual
extends: .only-schedules-or-manual
stage: build
tags:
- freebsd-13

View File

@ -136,6 +136,8 @@ test_types (void)
* to make sure that we dont warn when built against older third party code. */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wunknown-warning-option"
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
g_atomic_pointer_set (&vp_str_vol, NULL);
g_atomic_pointer_set (&vp_str, str);