From fde38c099f062429dd501ab24efe4917f312b110 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 4 Jun 2015 16:12:04 +0200 Subject: [MSVC 2015] Try to fix warinings turned errors. Change-Id: Ife5aba55d6953fbd3874095f2e469a844ca8ef2e Reviewed-on: https://code.wireshark.org/review/8762 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/stream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/stream.c') diff --git a/epan/stream.c b/epan/stream.c index 03ab54a332..bb1bbc9c45 100644 --- a/epan/stream.c +++ b/epan/stream.c @@ -92,7 +92,7 @@ static guint stream_hash_func(gconstpointer k) const stream_key_t *key = (const stream_key_t *)k; /* is_circuit is redundant to the circuit/conversation pointer */ - return ((guint)(unsigned long)key->circ.circuit) ^ key->p2p_dir; + return (GPOINTER_TO_UINT(key->circ.circuit)) ^ key->p2p_dir; } /* compare func */ @@ -238,7 +238,7 @@ typedef struct fragment_key { static guint fragment_hash_func(gconstpointer k) { const fragment_key_t *key = (const fragment_key_t *)k; - return ((guint)(unsigned long)key->stream) + ((guint)key -> framenum) + ((guint)key->offset); + return (GPOINTER_TO_UINT(key->stream)) + ((guint)key -> framenum) + ((guint)key->offset); } /* compare func */ -- cgit v1.2.3