X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fcast%2Fcast.h;h=b108b0c864d3b0cd07e26a497040537921d674b4;hb=acb6106ca2778d74af91f9b92bc32df179195b6b;hp=2fa96445b338f6b6b341b3f2aad122963e91054e;hpb=3f4e83d8ac847d6bf0c20e88cdbca535e842a97b;p=ccan

diff --git a/ccan/cast/cast.h b/ccan/cast/cast.h
index 2fa96445..b108b0c8 100644
--- a/ccan/cast/cast.h
+++ b/ccan/cast/cast.h
@@ -1,6 +1,8 @@
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
 #ifndef CCAN_CAST_H
 #define CCAN_CAST_H
 #include "config.h"
+#include <stdint.h>
 #include <ccan/build_assert/build_assert.h>
 
 /**
@@ -37,9 +39,9 @@
  *		return NULL;
  *	}
  */
-#define cast_const(type, expr)					\
-	((type)(expr)						\
-	 + BUILD_ASSERT_OR_ZERO(cast_const_compat1((expr), type)))
+#define cast_const(type, expr)						\
+	((type)((intptr_t)(expr)					\
+		+ BUILD_ASSERT_OR_ZERO(cast_const_compat1((expr), type))))
 
 /**
  * cast_const2 - remove a const qualifier from a pointer to a pointer.
@@ -49,9 +51,9 @@
  * This ensures that you are only removing the const qualifier from an
  * expression.  The expression must otherwise match @type.
  */
-#define cast_const2(type, expr)					\
-	((type)(expr)						\
-	 + BUILD_ASSERT_OR_ZERO(cast_const_compat2((expr), type)))
+#define cast_const2(type, expr)						\
+	((type)((intptr_t)(expr)					\
+		+ BUILD_ASSERT_OR_ZERO(cast_const_compat2((expr), type))))
 
 /**
  * cast_const3 - remove a const from a pointer to a pointer to a pointer..
@@ -61,9 +63,9 @@
  * This ensures that you are only removing the const qualifier from an
  * expression.  The expression must otherwise match @type.
  */
-#define cast_const3(type, expr)					\
-	((type)(expr)						\
-	 + BUILD_ASSERT_OR_ZERO(cast_const_compat3((expr), type)))
+#define cast_const3(type, expr)						\
+	((type)((intptr_t)(expr)					\
+		+ BUILD_ASSERT_OR_ZERO(cast_const_compat3((expr), type))))
 
 
 /**
@@ -104,11 +106,11 @@
 	  )
 
 #define cast_const_strip1(expr)			\
-	__typeof__(*(struct { int z; __typeof__(expr) x; }){0}.x)
+	__typeof__(*(union { int z; __typeof__(expr) x; }){0}.x)
 #define cast_const_strip2(expr) \
-	__typeof__(**(struct { int z; __typeof__(expr) x; }){0}.x)
+	__typeof__(**(union { int z; __typeof__(expr) x; }){0}.x)
 #define cast_const_strip3(expr) \
-	__typeof__(***(struct { int z; __typeof__(expr) x; }){0}.x)
+	__typeof__(***(union { int z; __typeof__(expr) x; }){0}.x)
 #define cast_const_compat1(expr, type)					\
 	__builtin_types_compatible_p(cast_const_strip1(expr),		\
 				     cast_const_strip1(type))
@@ -121,11 +123,8 @@
 #else
 #define cast_sign_compatible(type, expr)		\
 	(sizeof(*(type)0) == 1 && sizeof(*(expr)) == 1)
-#define cast_const_compat1(expr, type)		\
-	(sizeof(*(expr)) == sizeof(*(type)0))
-#define cast_const_compat2(expr, type)		\
-	(sizeof(**(expr)) == sizeof(**(type)0))
-#define cast_const_compat3(expr, type)			\
-	(sizeof(***(expr)) == sizeof(***(type)0))
+#define cast_const_compat1(expr, type)		(1)
+#define cast_const_compat2(expr, type)		(1)
+#define cast_const_compat3(expr, type)		(1)
 #endif
 #endif /* CCAN_CAST_H */