From 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:33 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/except.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/except.c') diff --git a/epan/except.c b/epan/except.c index 9a6207e0..6aaf63f4 100644 --- a/epan/except.c +++ b/epan/except.c @@ -143,11 +143,11 @@ static int init_counter; static void unhandled_catcher(except_t *); static void (*uh_catcher_ptr)(except_t *) = unhandled_catcher; /* We need this 'size_t' cast due to a glitch in GLib where g_malloc was prototyped - * as 'gpointer g_malloc (gulong n_bytes)'. This was later fixed to the correct prototype - * 'gpointer g_malloc (gsize n_bytes)'. In Wireshark we use the latter prototype + * as 'void *g_malloc (unsigned long n_bytes)'. This was later fixed to the correct prototype + * 'void *g_malloc (size_t n_bytes)'. In Wireshark we use the latter prototype * throughout the code. We can get away with this even with older versions of GLib by * adding a '(void *(*)(size_t))' cast whenever we refer to g_malloc. The only platform - * supported by Wireshark where this isn't safe (sizeof size_t != sizeof gulong) is Win64. + * supported by Wireshark where this isn't safe (sizeof size_t != sizeof unsigned long) is Win64. * However, we _always_ bundle the newest version of GLib on this platform so * the size_t issue doesn't exists here. Pheew.. */ static void *(*allocator)(size_t) = (void *(*)(size_t)) g_malloc; -- cgit v1.2.3