On 8/12/24 12:30, Daniel P. Berrangé wrote:
This mostly reverts commit 65491a2dfe00bfcf9f09a8d6eab60234b56c8cc4.
There was a bug introduced in glib 2.67.0 which impacted libvirt with
clang causing -Wincompatible-pointer-types-discards-qualifiers warnings.
This was actually fixed quite quickly in 2.67.1 with
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
Our workaround was then broken with glib 2.81.1 due to commit
14b3d5da9019150d821f6178a075d85044b4c255 changing the signature of the
(private) macro we were overriding.
Since odd-number glib releases are development snapshots, and the
original problem was only present in 2.67.0 and no other releases,
just drop the workaround entirely.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/util/glibcompat.h | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
I've tested this locally against glib's main and can confirm it fixes
the problem.
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal