From a86c5f7cae7ec9a3398300555a0b644689d946a1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:53 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-ftdi-ft.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-ftdi-ft.h') diff --git a/epan/dissectors/packet-ftdi-ft.h b/epan/dissectors/packet-ftdi-ft.h index f5830c11..c6f29d1c 100644 --- a/epan/dissectors/packet-ftdi-ft.h +++ b/epan/dissectors/packet-ftdi-ft.h @@ -13,8 +13,6 @@ #ifndef __PACKET_FTDI_FT_H__ #define __PACKET_FTDI_FT_H__ -#include - typedef enum { FTDI_CHIP_UNKNOWN, FTDI_CHIP_FT8U232AM, @@ -36,11 +34,11 @@ typedef enum { } FTDI_INTERFACE; typedef struct _ftdi_mpsse_info_t { - guint32 bus_id; - guint32 device_address; + uint32_t bus_id; + uint32_t device_address; FTDI_CHIP chip; FTDI_INTERFACE iface; - gboolean mcu_mode; + bool mcu_mode; } ftdi_mpsse_info_t; #endif /* __PACKET_FTDI_FT_H__ */ -- cgit v1.2.3