Merge branch 'wip/dueno/volatile' into 'master'

Drop "volatile" for g_once_init_enter locations

See merge request GNOME/libsecret!77
This commit is contained in:
Daiki Ueno 2021-06-12 11:52:12 +00:00
commit fbad80754a
2 changed files with 2 additions and 2 deletions

View File

@ -64,7 +64,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
void void
egg_libgcrypt_initialize (void) egg_libgcrypt_initialize (void)
{ {
static volatile gsize gcrypt_initialized = 0; static size_t gcrypt_initialized = 0;
unsigned seed; unsigned seed;
if (g_once_init_enter (&gcrypt_initialized)) { if (g_once_init_enter (&gcrypt_initialized)) {

View File

@ -89,7 +89,7 @@ _secret_list_get_type (void)
GQuark GQuark
secret_error_get_quark (void) secret_error_get_quark (void)
{ {
static volatile gsize quark = 0; static gsize quark = 0;
static const GDBusErrorEntry entries[] = { static const GDBusErrorEntry entries[] = {
{ SECRET_ERROR_IS_LOCKED, "org.freedesktop.Secret.Error.IsLocked", }, { SECRET_ERROR_IS_LOCKED, "org.freedesktop.Secret.Error.IsLocked", },