summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-06 20:13:30 +0200
committerwm4 <wm4@nowhere>2016-09-06 20:15:07 +0200
commitc6b7a4dacee3067ad00abdb3abf71c7e8eb62e78 (patch)
treec397ec6d8704c62657a15d31077ce9e848605a89 /player
parent2a4e7dcaade6e4e772f614d931eeee59c9e768c9 (diff)
downloadmpv-c6b7a4dacee3067ad00abdb3abf71c7e8eb62e78.tar.bz2
mpv-c6b7a4dacee3067ad00abdb3abf71c7e8eb62e78.tar.xz
atomics: readd some emulation
This time it's emulation that's supposed to work (not just dummied out). Unlike the previous emulation, no mpv code has to be disabled, and everything should work (albeit possibly a bit slowly). On the other hand, it's not possible to implement this kind of emulation without compiler support. We use GNU statement expressions and __typeof__ in this case. This code is inactive if stdatomic.h is available.
Diffstat (limited to 'player')
-rw-r--r--player/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/player/main.c b/player/main.c
index 0bf207f5b7..b1aa30f9c3 100644
--- a/player/main.c
+++ b/player/main.c
@@ -75,6 +75,10 @@
#define FULLCONFIG "(missing)\n"
#endif
+#if !(HAVE_STDATOMIC || HAVE_ATOMIC_BUILTINS || HAVE_SYNC_BUILTINS)
+pthread_mutex_t mp_atomic_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
enum exit_reason {
EXIT_NONE,
EXIT_NORMAL,