aboutsummaryrefslogtreecommitdiffstats
path: root/packet-x11.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-05-16 19:29:03 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-05-16 19:29:03 +0000
commit355c726965a46ad27e83b19b3a847c9e7df4df5e (patch)
treeb679c34d8393254ca0c90ebfc697218510fea875 /packet-x11.c
parent9f920852e007099bdbafbae51751041d0fb4eb67 (diff)
From Andrew Esh: fix a compiler warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5491 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-x11.c')
-rw-r--r--packet-x11.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-x11.c b/packet-x11.c
index a56cb6f3fd..7890fadb2b 100644
--- a/packet-x11.c
+++ b/packet-x11.c
@@ -2,7 +2,7 @@
* Routines for X11 dissection
* Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
*
- * $Id: packet-x11.c,v 1.43 2002/04/23 06:06:03 guy Exp $
+ * $Id: packet-x11.c,v 1.44 2002/05/16 19:29:03 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -667,9 +667,9 @@ static const value_string zero_is_none_vals[] = {
int bitmask_offset; \
int bitmask_size; \
proto_tree *bitmask_tree; \
- bitmask_value = ((size == 1) ? VALUE8(tvb, *offsetp) : \
- ((size == 2) ? VALUE16(tvb, *offsetp) : \
- VALUE32(tvb, *offsetp))); \
+ bitmask_value = ((size == 1) ? (guint32)VALUE8(tvb, *offsetp) : \
+ ((size == 2) ? (guint32)VALUE16(tvb, *offsetp) : \
+ (guint32)VALUE32(tvb, *offsetp))); \
bitmask_offset = *offsetp; \
bitmask_size = size; \
ti = proto_tree_add_uint(t, hf_x11_##name##_mask, tvb, *offsetp, size, bitmask_value); \