summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-s7comm.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
commita86c5f7cae7ec9a3398300555a0b644689d946a1 (patch)
tree39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-s7comm.h
parentReleasing progress-linux version 4.2.6-1~progress7.99u1. (diff)
downloadwireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz
wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-s7comm.h')
-rw-r--r--epan/dissectors/packet-s7comm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-s7comm.h b/epan/dissectors/packet-s7comm.h
index e853def5..e58b8599 100644
--- a/epan/dissectors/packet-s7comm.h
+++ b/epan/dissectors/packet-s7comm.h
@@ -52,7 +52,7 @@
extern const value_string s7comm_item_return_valuenames[];
-guint32 s7comm_decode_ud_cpu_diagnostic_message(tvbuff_t *tvb, packet_info *pinfo, gboolean add_info_to_col, proto_tree *data_tree, guint32 offset);
+uint32_t s7comm_decode_ud_cpu_diagnostic_message(tvbuff_t *tvb, packet_info *pinfo, bool add_info_to_col, proto_tree *data_tree, uint32_t offset);
#endif