X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fapi_gcc.h;h=b31f3fcd2a1d5a52426c01537bd76820c00023a3;hp=1ad7345e7ce1ad681bd2043813bdb5aaaff916a5;hb=8adc73ec4c752aa115493ffb8a6e2c2869632a53;hpb=833dbdb633ba44bfb71b4b965a83096d8e4e827b

diff --git a/tests/api_gcc.h b/tests/api_gcc.h
index 1ad7345..b31f3fc 100644
--- a/tests/api_gcc.h
+++ b/tests/api_gcc.h
@@ -69,12 +69,13 @@
  * Machine parameters.
  */
 
-#define CACHE_LINE_SIZE 64
+/* #define CACHE_LINE_SIZE 64 */
 #define ____cacheline_internodealigned_in_smp \
 	__attribute__((__aligned__(1 << 6)))
 
 #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.
  *
@@ -287,7 +290,6 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
 /*
  * 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) );})
@@ -297,7 +299,7 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
  */
 
 #ifndef CACHE_LINE_SIZE
-#define CACHE_LINE_SIZE 128
+/* #define CACHE_LINE_SIZE 128 */
 #endif /* #ifndef CACHE_LINE_SIZE */
 
 /*
@@ -634,11 +636,11 @@ 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) );})
 
+#if 0
 /*
  * Simple doubly linked list implementation.
  *
@@ -1163,6 +1165,8 @@ static inline void list_splice_tail_init(struct list_head *list,
 	     &pos->member != (head); 					\
 	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
 
+#endif //0
+
 /*
  * Double linked lists with a single pointer list head.
  * Mostly useful for hash tables where the two pointer list head is