From d080df2e8c0524c11460374ca403cbdbc7704741 Mon Sep 17 00:00:00 2001
From: Samy Al Bahra <sbahra@repnop.org>
Date: Sat, 21 Apr 2012 19:20:28 -0400
Subject: [PATCH] ck_bitmap: Strict aliasing fixes for older versions of GCC.

---
 include/ck_bitmap.h | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/include/ck_bitmap.h b/include/ck_bitmap.h
index 38c9c60..eb5822e 100644
--- a/include/ck_bitmap.h
+++ b/include/ck_bitmap.h
@@ -62,35 +62,38 @@
 #define CK_BITMAP_BLOCKS(n) \
 	(((n) + (CK_BITMAP_BLOCK - 1)) / CK_BITMAP_BLOCK)
 
-#define CK_BITMAP_INSTANCE(n_entries)				\
-	struct {						\
-		unsigned int n_bits;				\
-		CK_BITMAP_TYPE map[CK_BITMAP_BLOCKS(n_entries)];\
+#define CK_BITMAP_INSTANCE(n_entries)					\
+	union {								\
+		struct {						\
+			unsigned int n_bits;				\
+			CK_BITMAP_TYPE map[CK_BITMAP_BLOCKS(n_entries)];\
+		} content;						\
+		struct ck_bitmap bitmap;				\
 	}
 
 #define CK_BITMAP_INIT(a, b, c) \
-	ck_bitmap_init((struct ck_bitmap *)(a), (b), (c))
+	ck_bitmap_init(&(a)->bitmap, (b), (c))
 
 #define CK_BITMAP_SET_MPMC(a, b) \
-	ck_bitmap_set_mpmc((struct ck_bitmap *)(a), (b))
+	ck_bitmap_set_mpmc(&(a)->bitmap, (b))
 
 #define CK_BITMAP_RESET_MPMC(a, b) \
-	ck_bitmap_reset_mpmc((struct ck_bitmap *)(a), (b))
+	ck_bitmap_reset_mpmc(&(a)->bitmap, (b))
 
 #define CK_BITMAP_CLEAR(a) \
-	ck_bitmap_clear((struct ck_bitmap *)(a))
+	ck_bitmap_clear(&(a)->bitmap)
 
 #define CK_BITMAP_TEST(a, b) \
-	ck_bitmap_test((struct ck_bitmap *)(a), (b))
+	ck_bitmap_test(&(a)->bitmap, (b))
 
 #define CK_BITMAP_BITS(a, b) \
-	ck_bitmap_bits((struct ck_bitmap *)(a))
+	ck_bitmap_bits(&(a)->bitmap)
 
 #define CK_BITMAP_BUFFER(a) \
-	ck_bitmap_buffer((struct ck_bitmap *)(a))
+	ck_bitmap_buffer(&(a)->bitmap)
 
 #define CK_BITMAP(a) \
-	((struct ck_bitmap *)(a))
+	(&(a)->bitmap)
 
 struct ck_bitmap {
 	unsigned int n_bits;