summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2016-08-31 11:31:54 +0200
committerPeter Wu <peter@lekensteyn.nl>2016-09-01 08:22:35 +0000
commit717ca58264f1c745c3efb8d9da0050d52b51bb1f (patch)
tree1f7d5b2460e99de262b735bd58af2a67ac3a1879 /epan
parent71f867490d28c5b66494a81dca775f2a47995ecb (diff)
downloadwireshark-717ca58264f1c745c3efb8d9da0050d52b51bb1f.tar.gz
ipv6: fix build with old 32-bit glib headers (master only)
Introduced with v2.3.0rc0-112-gdcb7b71, nxt is only a guint8* which fails on 32-bit glib before 2.31.2. Change-Id: Ide1816a971fa213f5669a7fa71bc111d5b1cc921 Reviewed-on: https://code.wireshark.org/review/17418 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 2491ae2f1a..55c2df8600 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -378,7 +378,7 @@ static gpointer ipv6_value(packet_info *pinfo)
if (nxt == NULL) {
return GUINT_TO_POINTER(255); /* Reserved IP Protocol */
}
- return GUINT_TO_POINTER(*nxt);
+ return GUINT_TO_POINTER((guint)*nxt);
}
static void ipv6_prompt(packet_info *pinfo, gchar *result)