diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-02-07 09:12:25 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-02-12 14:18:31 -0800 |
| commit | dd89e1efd05299ec4015d144158d2eceeb6a6484 (patch) | |
| tree | fbf38b78769742156f7aab45058e7ef1a59cb9b1 | |
| parent | 95f23cf894757d05a6b6c980062a46968dc069b1 (diff) | |
Stop undefining _ATOMIC_TYPE in Solaris/NetBSD section of xf86atomic.h
Since the atomic_set() macro references _ATOMIC_TYPE, undefining it
broke that macro, resulting in build errors of:
"intel_bufmgr_gem.c", line 775: undefined symbol: _ATOMIC_TYPE
Now that we're leaving the macro in the namespace, renamed it to start
with LIBDRM_ instead of _ to avoid polluting others namespace.
Regression introduced in 87fdd32c8779648 Add NetBSD atomic ops support.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-By: Thomas Klausner <wiz@NetBSD.org>
| -rw-r--r-- | xf86atomic.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xf86atomic.h b/xf86atomic.h index e794af8e..8c4b696a 100644 --- a/xf86atomic.h +++ b/xf86atomic.h @@ -81,22 +81,21 @@ typedef struct { #define HAS_ATOMIC_OPS 1 #if defined(__NetBSD__) -#define _ATOMIC_TYPE int +#define LIBDRM_ATOMIC_TYPE int #else -#define _ATOMIC_TYPE uint_t +#define LIBDRM_ATOMIC_TYPE uint_t #endif -typedef struct { _ATOMIC_TYPE atomic; } atomic_t; +typedef struct { LIBDRM_ATOMIC_TYPE atomic; } atomic_t; # define atomic_read(x) (int) ((x)->atomic) -# define atomic_set(x, val) ((x)->atomic = (_ATOMIC_TYPE)(val)) +# define atomic_set(x, val) ((x)->atomic = (LIBDRM_ATOMIC_TYPE)(val)) # define atomic_inc(x) (atomic_inc_uint (&(x)->atomic)) # define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 0) # define atomic_add(x, v) (atomic_add_int(&(x)->atomic, (v))) # define atomic_dec(x, v) (atomic_add_int(&(x)->atomic, -(v))) # define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint (&(x)->atomic, oldv, newv) -#undef _ATOMIC_TYPE #endif #if ! HAS_ATOMIC_OPS |