X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fapi_gcc.h;h=721af0a4813c25c498c391de49ba5d5e8d7d68c9;hb=ba59a0c7b244a0939a2298fc76a9002436ef9674;hp=1ad7345e7ce1ad681bd2043813bdb5aaaff916a5;hpb=833dbdb633ba44bfb71b4b965a83096d8e4e827b;p=urcu.git

diff --git a/tests/api_gcc.h b/tests/api_gcc.h
index 1ad7345..721af0a 100644
--- a/tests/api_gcc.h
+++ b/tests/api_gcc.h
@@ -75,6 +75,7 @@
 
 #define LOCK_PREFIX "lock ; "
 
+#if 0 /* duplicate with arch_atomic.h */
 /*
  * Atomic data structure, initialization, and access.
  */
@@ -251,6 +252,8 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
 #define smp_mb__before_atomic_inc()	barrier()
 #define smp_mb__after_atomic_inc()	barrier()
 
+#endif //0 /* duplicate with arch_atomic.h */
+
 /*
  * api_pthreads.h: API mapping to pthreads environment.
  *
@@ -282,12 +285,12 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
 #include <pthread.h>
 #include <sched.h>
 #include <sys/param.h>
+#include <arch.h>
 /* #include "atomic.h" */
 
 /*
  * Compiler magic.
  */
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #define container_of(ptr, type, member) ({			\
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})
@@ -634,7 +637,6 @@ static void smp_init(void)
 #define LIST_POISON1  ((void *) 0x00100100)
 #define LIST_POISON2  ((void *) 0x00200200)
 
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #define container_of(ptr, type, member) ({			\
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})