mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-28 14:22:27 +00:00
9801f91a8e
In this previous commit:
commit 65491a2dfe00bfcf9f09a8d6eab60234b56c8cc4
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>
87 lines
3.1 KiB
C
87 lines
3.1 KiB
C
/*
|
|
* Copyright (C) 2019 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <glib.h>
|
|
#include <glib/gstdio.h>
|
|
#include <glib-object.h>
|
|
|
|
#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
|
|
*
|
|
* For that we need to disable the one check that produces an error in our
|
|
* builds when using any G_DEFINE_TYPE* macro. Thankfully all those macros end
|
|
* up using _G_DEFINE_TYPE_EXTENDED_BEGIN. Because with that we can redefine
|
|
* this one macro to cover all use cases. The macro is defined the same way it
|
|
* is defined in glib (with a very low probability of being changed thanks to a
|
|
* comment above it).
|
|
*/
|
|
# 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-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__ */
|
|
|
|
#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);
|
|
gint vir_g_fsync(gint fd);
|
|
char *vir_g_strdup_printf(const char *msg, ...)
|
|
G_GNUC_PRINTF(1, 2);
|
|
char *vir_g_strdup_vprintf(const char *msg, va_list args)
|
|
G_GNUC_PRINTF(1, 0);
|
|
|
|
#if !GLIB_CHECK_VERSION(2, 64, 0)
|
|
# define g_strdup_printf vir_g_strdup_printf
|
|
# define g_strdup_vprintf vir_g_strdup_vprintf
|
|
#endif
|
|
|
|
#define g_canonicalize_filename vir_g_canonicalize_filename
|
|
#undef g_fsync
|
|
#define g_fsync vir_g_fsync
|