diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-03-04 11:38:40 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-14 16:33:59 +0000 |
commit | eec64066073428e38d5b0b6947ff302943188f65 (patch) | |
tree | ec55d656734941dee8b2a599b588a12cc174337d /meta/recipes-core/glib-2.0/glib-2.0/0019-gatomicarray-Drop-volatile-qualifier-from-GAtomicArr.patch | |
parent | 8a74a7deca45ceef351f47a9f160df9bafc0f546 (diff) | |
download | poky-eec64066073428e38d5b0b6947ff302943188f65.tar.gz |
glib-2.0: Drop volatile qualifier
Fixes
glib/gatomic.h:112:5: error: argument 2 of '__atomic_load' discards 'volatile' qualifier [-Werror=incompatible-pointer-types]
(From OE-Core rev: 06ac55a06f2300fa5442ec73a28c3f52022cc640)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0019-gatomicarray-Drop-volatile-qualifier-from-GAtomicArr.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0019-gatomicarray-Drop-volatile-qualifier-from-GAtomicArr.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0019-gatomicarray-Drop-volatile-qualifier-from-GAtomicArr.patch b/meta/recipes-core/glib-2.0/glib-2.0/0019-gatomicarray-Drop-volatile-qualifier-from-GAtomicArr.patch new file mode 100644 index 0000000000..be3211664a --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0019-gatomicarray-Drop-volatile-qualifier-from-GAtomicArr.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 46bae4f18dfec8fedda82648091752d270b2dff8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Withnall <pwithnall@endlessos.org> | ||
3 | Date: Wed, 11 Nov 2020 19:19:20 +0000 | ||
4 | Subject: [PATCH 19/29] gatomicarray: Drop volatile qualifier from GAtomicArray | ||
5 | API | ||
6 | |||
7 | This is an API break, but it should not affect third party code since | ||
8 | that code should not be interacting with the `data` member in a way that | ||
9 | invokes its `volatile` qualifier (such as copying to an intermediate | ||
10 | variable). | ||
11 | |||
12 | Signed-off-by: Philip Withnall <pwithnall@endlessos.org> | ||
13 | |||
14 | Helps: #600 | ||
15 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719] | ||
16 | --- | ||
17 | gobject/gatomicarray.h | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/gobject/gatomicarray.h b/gobject/gatomicarray.h | ||
21 | index 9550fa396..89043c5e4 100644 | ||
22 | --- a/gobject/gatomicarray.h | ||
23 | +++ b/gobject/gatomicarray.h | ||
24 | @@ -29,7 +29,7 @@ G_BEGIN_DECLS | ||
25 | |||
26 | typedef struct _GAtomicArray GAtomicArray; | ||
27 | struct _GAtomicArray { | ||
28 | - volatile gpointer data; /* elements - atomic */ | ||
29 | + gpointer data; /* elements - atomic */ | ||
30 | }; | ||
31 | |||
32 | void _g_atomic_array_init (GAtomicArray *array); | ||
33 | @@ -42,7 +42,7 @@ void _g_atomic_array_update (GAtomicArray *array, | ||
34 | #define G_ATOMIC_ARRAY_GET_LOCKED(_array, _type) ((_type *)((_array)->data)) | ||
35 | |||
36 | #define G_ATOMIC_ARRAY_DO_TRANSACTION(_array, _type, _C_) G_STMT_START { \ | ||
37 | - volatile gpointer *_datap = &(_array)->data; \ | ||
38 | + gpointer *_datap = &(_array)->data; \ | ||
39 | _type *transaction_data, *__check; \ | ||
40 | \ | ||
41 | __check = g_atomic_pointer_get (_datap); \ | ||
42 | -- | ||
43 | 2.30.1 | ||
44 | |||