RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

osdep/atomic: fix potential shadowing warnings 

The stdatomic emulation adds "_" to each variable used inside the
macros, to avoid that compilers print -Wshadow warnings for identifiers
that are also used in surrounding code. Do this more consistently,
because new warnings have been showing up.
This commit is contained in:
wm4 2018-02-21 11:46:39 +01:00 committed by Kevin Mitchell
parent aa974b2aa7
commit 74c3c2ccb4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osdep/atomic.h
View File

@ -54,9 +54,9 @@ extern pthread_mutex_t mp_atomic_mutex;
#define atomic_load(p) \
({ __typeof__(p) p_ = (p); \
pthread_mutex_lock(&mp_atomic_mutex); \
__typeof__(p_->v) v = p_->v; \
__typeof__(p_->v) v_ = p_->v; \
pthread_mutex_unlock(&mp_atomic_mutex); \
v; })
v_; })
#define atomic_store(p, val) \
({ __typeof__(val) val_ = (val); \
__typeof__(p) p_ = (p); \
@ -67,10 +67,10 @@ extern pthread_mutex_t mp_atomic_mutex;
({ __typeof__(a) a_ = (a); \
__typeof__(b) b_ = (b); \
pthread_mutex_lock(&mp_atomic_mutex); \
__typeof__(a_->v) v = a_->v; \
a_->v = v op b_; \
__typeof__(a_->v) v_ = a_->v; \
a_->v = v_ op b_; \
pthread_mutex_unlock(&mp_atomic_mutex); \
v; })
v_; })
#define atomic_fetch_add(a, b) atomic_fetch_op(a, b, +)
#define atomic_fetch_and(a, b) atomic_fetch_op(a, b, &)
#define atomic_fetch_or(a, b) atomic_fetch_op(a, b, |)
@ -79,14 +79,14 @@ extern pthread_mutex_t mp_atomic_mutex;
__typeof__(old) old_ = (old); \
__typeof__(new) new_ = (new); \
pthread_mutex_lock(&mp_atomic_mutex); \
int res = p_->v == *old_; \
if (res) { \
int res_ = p_->v == *old_; \
if (res_) { \
p_->v = new_; \
} else { \
*old_ = p_->v; \
} \
pthread_mutex_unlock(&mp_atomic_mutex); \
res; })
res_; })
#endif /* else HAVE_STDATOMIC */