mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-14 12:09:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'fix-stdc-no-atomics-typo' into 'main'

Browse source 
systemclock: fix usage of __STDC_NO_ATOMICS__

See merge request gstreamer/gstreamer!6848
This commit is contained in:
Alexander Slobodeniuk 2024-05-15 06:22:52 +00:00
parent 64cac1ed99 0e3e688bed
commit 0a4600308b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gstreamer/gst/gstsystemclock.c
View file

@ -75,7 +75,7 @@ static LARGE_INTEGER performance_counter_frequency;
* to a simple memory read.
*/
#if defined __APPLE__ || defined G_OS_WIN32
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS)
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__)
#include <stdatomic.h>
typedef atomic_int gst_atomic_int;
@ -112,11 +112,11 @@ gst_atomic_int_set_release (gst_atomic_int * x, gint val)
{
InterlockedOrRelease (x, 1);
}
#else /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS) */
#else /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__) */
typedef int gst_atomic_int;
#define gst_atomic_int_get_acquire(x) g_atomic_int_get(x)
#define gst_atomic_int_set_release(x, val) g_atomic_int_set(x, val)
#endif /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS) */
#endif /* defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__) */
#endif /* defined __APPLE__ || defined G_OS_WIN32 */
/* priv_gst_clock_init: