aboutsummaryrefslogtreecommitdiffstats
path: root/epan/emem.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-08 14:40:23 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-08 14:40:23 +0000
commit266f00d1d0e5d0882edf723c422ef1141e4fc32b (patch)
treef37bc0a516d23e706a821d7d4c38ea5e884665dc /epan/emem.c
parent39ccd839ff08394b6665eb4b2a7455699e7f011b (diff)
From Harald Welte via bug 4106:
Fix 'cast from pointer to integer of different size' git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30402 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/emem.c')
-rw-r--r--epan/emem.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/emem.c b/epan/emem.c
index 2c75a27de2..550c09afb0 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -282,7 +282,11 @@ se_init_chunk(void)
se_packet_mem.used_list=NULL;
se_debug_use_chunks = (gboolean) (!getenv("WIRESHARK_DEBUG_SE_NO_CHUNKS"));
- se_debug_use_canary = (gboolean) (getenv("WIRESHARK_DEBUG_SE_USE_CANARY"));
+
+ if (getenv("WIRESHARK_DEBUG_SE_USE_CANARY"))
+ se_debug_use_canary = TRUE;
+ else
+ se_debug_use_canary = FALSE;
if (se_debug_use_canary)
emem_canary(se_canary);