summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-04-27 20:02:52 +0000
committerNick Mathewson <nickm@torproject.org>2005-04-27 20:02:52 +0000
commitd0a9a8bdd3538f626243daad52c7eb0ba6085507 (patch)
tree7e8652aa355e2bb7c4d6097e3b783ab14e14daee
parent53607d3bb352e93b72360a7772cc60532810566b (diff)
downloadtor-d0a9a8bdd3538f626243daad52c7eb0ba6085507.tar.gz
tor-d0a9a8bdd3538f626243daad52c7eb0ba6085507.zip
Appease VC7. It has a strangely puritanical attitude about what programmers are allowed to do a consenting void*.tor-0.1.0.5-rc
svn:r4140
-rw-r--r--src/or/buffers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 903d842434..d5a4e68369 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -23,8 +23,8 @@ const char buffers_c_id[] = "$Id$";
*/
#define START_MAGIC 0x70370370u
#define END_MAGIC 0xA0B0C0D0u
-#define RAW_MEM(m) ((m)-4)
-#define GUARDED_MEM(m) ((m)+4)
+#define RAW_MEM(m) ((void*)(((char*)m)-4))
+#define GUARDED_MEM(m) ((void*)(((char*)m)+4))
#define ALLOC_LEN(ln) ((ln)+8)
#define SET_GUARDS(m, ln) \
do { set_uint32((m)-4,START_MAGIC); set_uint32((m)+ln,END_MAGIC); } while (0)