geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 87fdd32c87 Add NetBSD atomic ops support.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-By: Thomas Klausner <wiz@NetBSD.org>
main
Alan Coopersmith 2015-02-07 09:12:25 -08:00
parent 95f23cf894
commit dd89e1efd0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xf86atomic.h
View File

@ -81,22 +81,21 @@ typedef struct {
#define HAS_ATOMIC_OPS 1 #define HAS_ATOMIC_OPS 1
#if defined(__NetBSD__) #if defined(__NetBSD__)
#define _ATOMIC_TYPE int #define LIBDRM_ATOMIC_TYPE int
#else #else
#define _ATOMIC_TYPE uint_t #define LIBDRM_ATOMIC_TYPE uint_t
#endif #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_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_inc(x) (atomic_inc_uint (&(x)->atomic))
# define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 0) # 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_add(x, v) (atomic_add_int(&(x)->atomic, (v)))
# define atomic_dec(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) # define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint (&(x)->atomic, oldv, newv)
#undef _ATOMIC_TYPE
#endif #endif
#if ! HAS_ATOMIC_OPS #if ! HAS_ATOMIC_OPS