diff options
| author | Ondrej Holy <oholy@redhat.com> | 2021-02-12 14:02:31 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2021-02-12 14:45:49 +0100 |
| commit | 4bf0aa8e38d64c92650226b28df38be35a86b4f9 (patch) | |
| tree | 24dafc25fc146d63edcc20e03fb8ba65dc1e8feb | |
| parent | 9869544ac0a770a904dda593704ba2fb02662277 (diff) | |
| download | gvfs-4bf0aa8e38d64c92650226b28df38be35a86b4f9.tar.gz | |
Drop use of volatile qualifier
GVfs build with --werror fails currently because of glib!1719. Let's
drop the volatile qualifier as it doesn't help with atomicity anyway.
Relates: https://gitlab.gnome.org/GNOME/glib/-/issues/600
| -rw-r--r-- | daemon/gvfsjobsource.c | 2 | ||||
| -rw-r--r-- | metadata/metatree.c | 2 | ||||
| -rw-r--r-- | monitor/goa/goavolumemonitor.c | 2 | ||||
| -rw-r--r-- | monitor/udisks2/gvfsudisks2volumemonitor.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/daemon/gvfsjobsource.c b/daemon/gvfsjobsource.c index 6d65270a..6d6c886e 100644 --- a/daemon/gvfsjobsource.c +++ b/daemon/gvfsjobsource.c @@ -36,7 +36,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; GType g_vfs_job_source_get_type (void) { - static volatile gsize g_define_type_id__volatile = 0; + static gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { diff --git a/metadata/metatree.c b/metadata/metatree.c index 0c11ddca..8412455e 100644 --- a/metadata/metatree.c +++ b/metadata/metatree.c @@ -170,7 +170,7 @@ GVfsMetadata * meta_tree_get_metadata_proxy () { static GVfsMetadata *proxy = NULL; - static volatile gsize initialized = 0; + static gsize initialized = 0; if (g_once_init_enter (&initialized)) { diff --git a/monitor/goa/goavolumemonitor.c b/monitor/goa/goavolumemonitor.c index 256e9398..46855c84 100644 --- a/monitor/goa/goavolumemonitor.c +++ b/monitor/goa/goavolumemonitor.c @@ -326,7 +326,7 @@ get_goa_client_sync (GError **error) { static GoaClient *client = NULL; static GError *_error = NULL; - static volatile gsize initialized = 0; + static gsize initialized = 0; if (g_once_init_enter (&initialized)) { diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c index 4ecabd99..4d4f234a 100644 --- a/monitor/udisks2/gvfsudisks2volumemonitor.c +++ b/monitor/udisks2/gvfsudisks2volumemonitor.c @@ -437,7 +437,7 @@ get_udisks_client_sync (GError **error) { static UDisksClient *_client = NULL; static GError *_error = NULL; - static volatile gsize initialized = 0; + static gsize initialized = 0; if (g_once_init_enter (&initialized)) { |