aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-25 06:55:10 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-25 06:55:10 +0000
commit57c9c3189ae6da6620b91d3dff3b427448b8ebb3 (patch)
tree0859c1bb4aaa289f2e1c983243f579fc89a3c7c5
parent51a1c68bc748f1fce2461b3c8a2a75c9c20477d6 (diff)
downloadruby-57c9c3189ae6da6620b91d3dff3b427448b8ebb3.tar.gz
ccan/container_of/container_of.h: avoid warning with -Wcast-qual
* ccan/container_of/container_of.h (container_off_var): avoid warning with -Wcast-qual [ccan ba5ad771af4aa9e085498de6c3c665c52694460f (Rusty Russell)] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ccan/container_of/container_of.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f388f6216b..c3fac3f09c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 25 15:44:12 2014 Eric Wong <e@80x24.org>
+
+ * ccan/container_of/container_of.h (container_off_var):
+ avoid warning with -Wcast-qual
+ [ccan ba5ad771af4aa9e085498de6c3c665c52694460f (Rusty Russell)]
+
Wed Jun 25 10:19:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (env_aset, env_has_key, env_assoc, env_has_value),
diff --git a/ccan/container_of/container_of.h b/ccan/container_of/container_of.h
index a65f4bb975..6d1a5be8ac 100644
--- a/ccan/container_of/container_of.h
+++ b/ccan/container_of/container_of.h
@@ -100,7 +100,7 @@
container_off(typeof(*var), member)
#else
#define container_off_var(var, member) \
- ((char *)&(var)->member - (char *)(var))
+ ((const char *)&(var)->member - (const char *)(var))
#endif
#endif /* CCAN_CONTAINER_OF_H */