diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/packet-actrace.h | |
parent | Adding debian version 4.2.6-1. (diff) | |
download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-actrace.h')
-rw-r--r-- | epan/dissectors/packet-actrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-actrace.h b/epan/dissectors/packet-actrace.h index 118fa766..8830a329 100644 --- a/epan/dissectors/packet-actrace.h +++ b/epan/dissectors/packet-actrace.h @@ -16,7 +16,7 @@ typedef struct _actrace_info_t int type; /* ACTRACE_CAS=1 ACTRACE_ISDN=2 */ int direction; /* direction BLADE_TO_PSTN=0 PSTN_TO_BLADE=1 */ int trunk; - gint32 cas_bchannel; - const gchar *cas_frame_label; + int32_t cas_bchannel; + const char *cas_frame_label; } actrace_info_t; |