diff options
| author | Niels De Graef <nielsdegraef@gmail.com> | 2021-05-02 16:57:13 +0200 |
|---|---|---|
| committer | Niels De Graef <nielsdegraef@gmail.com> | 2021-05-02 17:09:43 +0200 |
| commit | fcc616ace8f09cf29166bb5f9ca259f3479271f3 (patch) | |
| tree | 99f9b32c241291f2ad1353d6380722eda6ad9f08 /egg | |
| parent | 6058f0378ea91024af32c9dc42d3afde1bac3da8 (diff) | |
| download | gcr-fcc616ace8f09cf29166bb5f9ca259f3479271f3.tar.gz | |
Drop "volatile" for g_once_init_enter locationsbugfix/drop-volatile
This fixes a few (fatal in gcc 11) warnings, breaking the CI.
For the original discussion on why this change is needed, see
https://gitlab.gnome.org/GNOME/glib/-/issues/600
Diffstat (limited to 'egg')
| -rw-r--r-- | egg/egg-libgcrypt.c | 2 | ||||
| -rw-r--r-- | egg/egg-oid.c | 2 | ||||
| -rw-r--r-- | egg/egg-symkey.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c index 7c3e889..adb5195 100644 --- a/egg/egg-libgcrypt.c +++ b/egg/egg-libgcrypt.c @@ -59,7 +59,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL; void egg_libgcrypt_initialize (void) { - static volatile gsize gcrypt_initialized = 0; + static size_t gcrypt_initialized = 0; unsigned seed; if (g_once_init_enter (&gcrypt_initialized)) { diff --git a/egg/egg-oid.c b/egg/egg-oid.c index ec77a0b..48e9677 100644 --- a/egg/egg-oid.c +++ b/egg/egg-oid.c @@ -142,7 +142,7 @@ static OidInfo oid_info[] = { static OidInfo* find_oid_info (GQuark oid) { - static volatile gsize inited_oids = 0; + static size_t inited_oids = 0; int i; g_return_val_if_fail (oid != 0, NULL); diff --git a/egg/egg-symkey.c b/egg/egg-symkey.c index a0b08a3..76c4f6b 100644 --- a/egg/egg-symkey.c +++ b/egg/egg-symkey.c @@ -56,7 +56,7 @@ static GQuark OID_SHA1; static void init_quarks (void) { - static volatile gsize quarks_inited = 0; + static size_t quarks_inited = 0; if (g_once_init_enter (&quarks_inited)) { |