From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Wed, 30 Sep 2009 21:46:29 +0000 (-0400)
Subject: Merge commit 'origin/urcu/ht' into urcu/ht
X-Git-Tag: v0.7.0~43^2~239
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=af3dc81941a7a076fabada6b7575e4293595660b;p=userspace-rcu.git

Merge commit 'origin/urcu/ht' into urcu/ht

Conflicts:

	urcu-ht.c
---

af3dc81941a7a076fabada6b7575e4293595660b
diff --cc urcu-ht.c
index e598e45,7213c39..3b9012d
--- a/urcu-ht.c
+++ b/urcu-ht.c
@@@ -5,17 -5,20 +5,22 @@@
  
  #define _LGPL_SOURCE
  #include <stdlib.h>
+ #include <errno.h>
+ #include <assert.h>
+ #include <stdio.h>
+ 
  #include <urcu.h>
+ #include <urcu-defer.h>
  #include <arch.h>
  #include <arch_atomic.h>
- #include <assert.h>
  #include <compiler.h>
- #include <urcu-defer.h>
- #include <errno.h>
- #include <urcu-ht.h>
  #include <urcu/jhash.h>
 +#include <stdio.h>
 +#include <pthread.h>
+ #include <urcu-ht.h>
+ 
+ /* node flags */
+ #define	NODE_STOLEN	(1 << 0)
  
  struct rcu_ht_node;