openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

util: squelch G_DEFINE_TYPE volatile warnings with GCC 11 

In this previous commit:

  commit 65491a2dfe
  Author: Martin Kletzander <mkletzan@redhat.com>
  Date:   Thu Nov 12 13:58:53 2020 +0100

    Do not disable incompatible-pointer-types-discards-qualifiers

We selectively rewrite G_DEFINE_TYPE to avoid warnings about
mismatched volatile/non-volatile pointers that appeared with
CLang when using GLib2 >= 2.67

We have now just hit the reverse problem, GCC >= 11 has started
warning about mismatched volatile/non-volatile pointers but only
with GLib2 < 2.67. The new GLib2 avoids the warning, as does
older GCC.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-12-03 11:33:29 +00:00
parent d4745bb909
commit 9801f91a8e
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/util/glibcompat.h
View File

@ -22,7 +22,10 @@
#include <glib/gstdio.h>
#include <glib-object.h>
#if defined(__clang__) && GLIB_CHECK_VERSION(2, 67, 0)
#if GLIB_CHECK_VERSION(2, 67, 0)
# if defined(__clang__)
/*
* Clang detects (valid) issue in G_DEFINE_TYPE and derivatives starting with
* glib >= 2.67.0. See https://gitlab.gnome.org/GNOME/glib/-/issues/600
@ -34,16 +37,36 @@
* is defined in glib (with a very low probability of being changed thanks to a
* comment above it).
*/
# undef _G_DEFINE_TYPE_EXTENDED_BEGIN
# undef _G_DEFINE_TYPE_EXTENDED_BEGIN
# define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
# define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wincompatible-pointer-types-discards-qualifiers\"") \
_G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name, TYPE_PARENT) \
_G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \
_Pragma("GCC diagnostic pop")
#endif /* __clang__ */
# endif /* __clang__ */
#else /* GLib < 2.67.0 */
/*
* ...meanwhile GCC >= 11 has started issuing warnings about volatile
* from the old G_DEFINE_TYPE macro impl. IOW the new macros impls fixed
* new GCC, but broke CLang
*/
# if !defined(__clang__) && __GNUC_PREREQ (11, 0)
# undef _G_DEFINE_TYPE_EXTENDED_BEGIN
# define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wincompatible-pointer-types\"") \
_G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name, TYPE_PARENT) \
_G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \
_Pragma("GCC diagnostic pop")
# endif /* !clang && GCC >= 11.0 */
#endif /* GLib < 2.67.0 */
gchar * vir_g_canonicalize_filename(const gchar *filename,
const gchar *relative_to);