rculfqueue: LGPL-ize

[urcu.git] / urcu / compiler.h

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 5b7bb305b2de83b1828171f506d7241d3c692d03..fb8b8293ca132f683f9639c3a2502e934d17c326 100644 (file)
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -6,7 +6,7 @@
  *
  * Compiler definitions.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
  * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
@@ -37,7 +37,7 @@
  * use is to mediate communication between process-level code and irq/NMI
  * handlers, all running on the same CPU.
  */
-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&x)
+#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
 
 #ifndef max
 #define max(a,b) ((a)>(b)?(a):(b))
@@ -55,4 +55,10 @@
 #define BITS_PER_LONG  32
 #endif
 
+#define container_of(ptr, type, member)                                        \
+       ({                                                              \
+               const typeof(((type *)NULL)->member) * __ptr = (ptr);   \
+               (type *)((char *)__ptr - offsetof(type, member));       \
+       })
+
 #endif /* _URCU_COMPILER_H */