diff options
| author | wm4 <wm4@nowhere> | 2016-09-07 11:26:25 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-07 11:26:25 +0200 |
| commit | 591e21a2ebd105c33127d4a792d4d0e1a083fcfc (patch) | |
| tree | 14765300678fa16bff6ca0f47ec6cfbbb866d871 /video | |
| parent | c6b7a4dacee3067ad00abdb3abf71c7e8eb62e78 (diff) | |
| download | mpv-591e21a2ebd105c33127d4a792d4d0e1a083fcfc.tar.bz2 mpv-591e21a2ebd105c33127d4a792d4d0e1a083fcfc.tar.xz | |
osdep: rename atomics.h to atomic.h
The standard header is stdatomic.h, so the extra "s" freaks me out every
time I look at it.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/cocoa_common.m | 2 | ||||
| -rw-r--r-- | video/out/w32_common.c | 2 | ||||
| -rw-r--r-- | video/out/x11_common.c | 1 | ||||
| -rw-r--r-- | video/out/x11_common.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index 7cb30cc49d..18e6860e7d 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -30,7 +30,7 @@ #import "video/out/cocoa/mpvadapter.h" #include "osdep/threads.h" -#include "osdep/atomics.h" +#include "osdep/atomic.h" #include "osdep/macosx_compat.h" #include "osdep/macosx_events_objc.h" diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 46e9052e43..0dff2643b1 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -40,7 +40,7 @@ #include "osdep/io.h" #include "osdep/threads.h" #include "osdep/w32_keyboard.h" -#include "osdep/atomics.h" +#include "osdep/atomic.h" #include "misc/dispatch.h" #include "misc/rendezvous.h" #include "mpv_talloc.h" diff --git a/video/out/x11_common.c b/video/out/x11_common.c index aa2185315e..32f5c6c723 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -40,7 +40,6 @@ #include "vo.h" #include "win_state.h" -#include "osdep/atomics.h" #include "osdep/io.h" #include "osdep/timer.h" #include "osdep/subprocess.h" diff --git a/video/out/x11_common.h b/video/out/x11_common.h index 213d517205..de2a805efd 100644 --- a/video/out/x11_common.h +++ b/video/out/x11_common.h @@ -24,7 +24,7 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "osdep/atomics.h" +#include "osdep/atomic.h" #include "osdep/semaphore.h" #include "common/common.h" |