| Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 1 | From 7d417f8406b8fa32a25659120738d22be6a1b482 Mon Sep 17 00:00:00 2001 |
| 2 | From: Philip Withnall <pwithnall@endlessos.org> |
| 3 | Date: Mon, 16 Nov 2020 17:17:21 +0000 |
| 4 | Subject: [PATCH 28/29] gresource: Fix a pointer mismatch with an atomic load |
| 5 | |
| 6 | This squashes a warning when compiling with Clang. |
| 7 | |
| 8 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719] |
| 9 | Signed-off-by: Philip Withnall <pwithnall@endlessos.org> |
| 10 | --- |
| 11 | gio/gresource.c | 2 +- |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 | |
| 14 | diff --git a/gio/gresource.c b/gio/gresource.c |
| 15 | index 79a49d33d..b495d12ac 100644 |
| 16 | --- a/gio/gresource.c |
| 17 | +++ b/gio/gresource.c |
| 18 | @@ -1398,7 +1398,7 @@ register_lazy_static_resources (void) |
| 19 | void |
| 20 | g_static_resource_init (GStaticResource *static_resource) |
| 21 | { |
| 22 | - gpointer next; |
| 23 | + GStaticResource *next; |
| 24 | |
| 25 | do |
| 26 | { |
| 27 | -- |
| 28 | 2.30.1 |
| 29 | |