From 532d4a24e2013262dfa41fd85c06a9715c99abf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 24 Oct 2022 21:03:42 +0200
Subject: New upstream version 4.7

---
 include/libHX/defs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/libHX/defs.h')

diff --git a/include/libHX/defs.h b/include/libHX/defs.h
index 1ace518..49ca7d1 100644
--- a/include/libHX/defs.h
+++ b/include/libHX/defs.h
@@ -10,8 +10,8 @@
 #	endif
 #	ifndef containerof
 #		include <cstddef>
-#		define containerof(var, type, member) reinterpret_cast<type *>( \
-			reinterpret_cast<char *>(var) - offsetof(type, member))
+#		include <type_traits>
+#		define containerof(var, T, member) reinterpret_cast<std::conditional<std::is_const<std::remove_pointer<decltype(var)>::type>::value, std::add_const<T>::type, T>::type *>(reinterpret_cast<std::conditional<std::is_const<std::remove_pointer<decltype(var)>::type>::value, const char, char>::type *>(var) - offsetof(T, member))
 #	endif
 #	ifndef static_cast
 #		define static_cast(T, x) static_cast<T>(x)
-- 
cgit v1.2.3


From bfef0924f58eab930bdd826ac0132786abc32220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 29 Jan 2023 16:17:51 +0100
Subject: New upstream version 4.10

---
 include/libHX/defs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/libHX/defs.h')

diff --git a/include/libHX/defs.h b/include/libHX/defs.h
index 49ca7d1..9d17019 100644
--- a/include/libHX/defs.h
+++ b/include/libHX/defs.h
@@ -213,15 +213,15 @@ static __inline__ new_type signed_cast(unsigned char *expr)
 #	define container_of(v, s, m) containerof((v), s, m)
 #endif
 
-#ifdef _WIN32
+#if !defined(_WIN32) || (defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO + 0 > 0)
 	/*
 	 * Sufficiently old versions of the VC runtime do not even support %ll.
 	 */
-#	define HX_LONGLONG_FMT "I64"
-#	define HX_SIZET_FMT "I"
-#else
 #	define HX_LONGLONG_FMT "ll"
 #	define HX_SIZET_FMT "z"
+#else
+#	define HX_LONGLONG_FMT "I64"
+#	define HX_SIZET_FMT "I"
 #endif
 
 #endif /* _LIBHX_DEFS_H */
-- 
cgit v1.2.3