Fix: CDS_WFCQ_WOULDBLOCK typing for c++

[userspace-rcu.git] / urcu / wfcqueue.h

diff --git a/urcu/wfcqueue.h b/urcu/wfcqueue.h
index df26e339692b4694590352fa4454b366a67137e0..c0bb289741171e2fb8bbec203e69b4432bb96f21 100644 (file)
--- a/urcu/wfcqueue.h
+++ b/urcu/wfcqueue.h
@@ -43,7 +43,7 @@ extern "C" {
  * McKenney.
  */
 
-#define CDS_WFCQ_WOULDBLOCK    ((void *) -1UL)
+#define CDS_WFCQ_WOULDBLOCK    ((struct cds_wfcq_node *) -1UL)
 
 enum cds_wfcq_ret {
        CDS_WFCQ_RET_WOULDBLOCK =       -1,
@@ -79,10 +79,10 @@ struct cds_wfcq_head {
  * struct cds_wfcq_head and struct __cds_wfcq_head on any of those two
  * types.
  */
-typedef union __attribute__((__transparent_union__)) {
+typedef union {
        struct __cds_wfcq_head *_h;
        struct cds_wfcq_head *h;
-} cds_wfcq_head_ptr_t;
+} __attribute__((__transparent_union__)) cds_wfcq_head_ptr_t;
 
 struct cds_wfcq_tail {
        struct cds_wfcq_node *p;