[gstreamermm: 1/2] Fix build against glib 2.68
- From: Tim-Philipp Müller <tpm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gstreamermm: 1/2] Fix build against glib 2.68
- Date: Wed, 15 Sep 2021 10:10:40 +0000 (UTC)
commit 37116547fb5f9066978e39b4cf9f79f2154ad425
Author: Dominique Leuenberger <dimstar opensuse org>
Date: Tue Jul 13 10:32:30 2021 +0000
Fix build against glib 2.68
volatile has been misused in the past
Fixes #11
gstreamer/gstreamermm/register.h | 2 +-
tests/integration/test-integration-seekonstartup.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer/gstreamermm/register.h b/gstreamer/gstreamermm/register.h
index db66d172..a7ab3a63 100644
--- a/gstreamer/gstreamermm/register.h
+++ b/gstreamer/gstreamermm/register.h
@@ -110,7 +110,7 @@ register_mm_type(const gchar * type_name)
/* The typedef for GType may be gulong or gsize, depending on the
* system and whether the compiler is c++ or not. The g_once_init_*
* functions always take a gsize * though ... */
- static volatile gsize gonce_data = 0;
+ static gsize gonce_data = 0;
if (g_once_init_enter (&gonce_data)) {
GTypeInfo info;
diff --git a/tests/integration/test-integration-seekonstartup.cc
b/tests/integration/test-integration-seekonstartup.cc
index 247ac499..cd43a125 100644
--- a/tests/integration/test-integration-seekonstartup.cc
+++ b/tests/integration/test-integration-seekonstartup.cc
@@ -18,7 +18,7 @@ RefPtr<Glib::MainLoop> mainloop;
RefPtr<Bus> bus;
RefPtr<Pipeline> pipeline;
RefPtr<Pad> sink_pad;
-static volatile gint counter;
+static gint counter;
bool prerolled = false;
gboolean was_check = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]