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/conv_id.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/conv_id.h')
-rw-r--r-- | epan/conv_id.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/conv_id.h b/epan/conv_id.h index 0e4c7533..5a9c51ff 100644 --- a/epan/conv_id.h +++ b/epan/conv_id.h @@ -12,6 +12,8 @@ #ifndef __CONV_ID_H__ #define __CONV_ID_H__ +#include <stdint.h> + /** conv_id_t is a type that can aid in conversation identification. When * included in a "conversation key", whatever that may be, in addition to the * typical { address, port, address, port } quadruple, it helps differentiate @@ -29,7 +31,7 @@ * tcp.stream. If a conv_id_t field is not used, it should be assigned the * value CONV_ID_UNSET. */ -typedef guint32 conv_id_t; -#define CONV_ID_UNSET G_MAXUINT32 +typedef uint32_t conv_id_t; +#define CONV_ID_UNSET UINT32_MAX #endif /* __CONV_ID_H__ */ |