X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-pointer.h;h=dc1a0dac60718b15d1f8eb844b3feca315dd4068;hp=03bfe793c6aaf339a03d7aa0e64bed0b105a8646;hb=7be759d1adf95b168f09e513232ea26de15e1eaf;hpb=bdffa73aa208ad5f1e5b3a3cb6cbf86ac6996559

diff --git a/urcu-pointer.h b/urcu-pointer.h
index 03bfe79..dc1a0da 100644
--- a/urcu-pointer.h
+++ b/urcu-pointer.h
@@ -32,9 +32,9 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif 
+#endif
 
-#ifdef _LGPL_SOURCE
+#if defined(_LGPL_SOURCE) || defined(URCU_INLINE_SMALL_FUNCTIONS)
 
 #include <urcu/static/urcu-pointer.h>
 
@@ -62,10 +62,11 @@ extern "C" {
 #define rcu_xchg_pointer	_rcu_xchg_pointer
 #define rcu_set_pointer		_rcu_set_pointer
 
-#else /* !_LGPL_SOURCE */
+#else /* !(defined(_LGPL_SOURCE) || defined(URCU_INLINE_SMALL_FUNCTIONS)) */
 
 extern void *rcu_dereference_sym(void *p);
 #define rcu_dereference(p)						     \
+	__extension__							     \
 	({								     \
 		__typeof__(p) _________p1 =	URCU_FORCE_CAST(__typeof__(p), \
 			rcu_dereference_sym(URCU_FORCE_CAST(void *, p)));    \
@@ -74,6 +75,7 @@ extern void *rcu_dereference_sym(void *p);
 
 extern void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new);
 #define rcu_cmpxchg_pointer(p, old, _new)				     \
+	__extension__							     \
 	({								     \
 		__typeof__(*(p)) _________pold = (old);			     \
 		__typeof__(*(p)) _________pnew = (_new);		     \
@@ -86,6 +88,7 @@ extern void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new);
 
 extern void *rcu_xchg_pointer_sym(void **p, void *v);
 #define rcu_xchg_pointer(p, v)						     \
+	__extension__							     \
 	({								     \
 		__typeof__(*(p)) _________pv = (v);		             \
 		__typeof__(*(p)) _________p1 = URCU_FORCE_CAST(__typeof__(*(p)), \
@@ -108,7 +111,7 @@ extern void *rcu_set_pointer_sym(void **p, void *v);
 					    _________pv);		     \
 	} while (0)
 
-#endif /* !_LGPL_SOURCE */
+#endif /* !(defined(_LGPL_SOURCE) || defined(URCU_INLINE_SMALL_FUNCTIONS)) */
 
 /*
  * void rcu_assign_pointer(type *ptr, type *new)
@@ -119,7 +122,7 @@ extern void *rcu_set_pointer_sym(void **p, void *v);
  */
 #define rcu_assign_pointer(p, v)	rcu_set_pointer((&p), (v))
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 }
 #endif