diff options
| -rw-r--r-- | osdep/atomic.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/osdep/atomic.h b/osdep/atomic.h index a5608fa78a..85773cbcb5 100644 --- a/osdep/atomic.h +++ b/osdep/atomic.h @@ -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 */ |