aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-06-03 17:02:23 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-06-03 15:05:01 +0000
commit0a0a4c75a325716a3e8f8e21fdf112095a298827 (patch)
treecfcc3c1ea54640f95a48de3a98269c69e156a019
parent3eacdda619bd9ec4f16863934415c3fc79f65e18 (diff)
USB: Try to make Mac os 10.5 buildbot Happy
Fix warning: cast to pointer from integer of different size Change-Id: Ieed19204cb3be469c1b12f6ff87168b217a2a33d Reviewed-on: https://code.wireshark.org/review/1938 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r--epan/dissectors/packet-usb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 51a3dd1c92..4ace02bdc9 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -3349,8 +3349,7 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
device_protocol_data = NULL;
}
- p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_BUS_ID,
- GUINT_TO_POINTER(usb_conv_info->bus_id));
+ p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_BUS_ID, GUINT_TO_POINTER((guint)usb_conv_info->bus_id));
p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_DEVICE_ADDRESS, GUINT_TO_POINTER((guint)device_address));
if (tvb_length_remaining(tvb, offset) > 0) {