diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-08-31 11:32:54 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-09-01 08:22:12 +0000 |
| commit | 71f867490d28c5b66494a81dca775f2a47995ecb (patch) | |
| tree | a37fbaa94a56e3042ed384497be70db29c98a97e /epan/dissectors/packet-ipsec.c | |
| parent | e3c3d7a4afeeb8bc0519717e6c85c038fb99170a (diff) | |
ipsec: fix build with old 32-bit glib headers
In commit v2.3.0rc0-121-gb6d13ef, GUINT_TO_POINTER(ah_nxt) was added,
but on 32-bit glib before 2.31.2 this results in a type error. Change
the type of ah_nxt since all its users take a guint anyway.
Change-Id: I2fb030f79011b8a7159a0b0df26d3545b0ce3c06
Reviewed-on: https://code.wireshark.org/review/17419
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/dissectors/packet-ipsec.c')
| -rw-r--r-- | epan/dissectors/packet-ipsec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 688f9ca214..6b78e2ea03 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -1120,7 +1120,7 @@ dissect_ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { proto_tree *ah_tree, *root_tree; proto_item *pi, *ti; - guint8 ah_nxt; /* Next header */ + guint ah_nxt; /* Next header */ guint8 ah_len; /* Length of header in 32bit words minus 2 */ guint ah_hdr_len; /* Length of header in octets */ guint ah_icv_len; /* Length of ICV header field in octets */ |