33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/a29eb970c89f12d118830d0ee46cdda2b6cd7f8b
|
|
# Removes type conflict with _assert_fail between glibc and musl, will be in next release
|
|
diff --git a/src/libnm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h
|
|
index e556aa4b52a37f2fab9459314726b1b78fc068d9..75703e70b41d22d414af537b0bccc042e4d4ff1b 100644
|
|
--- a/src/libnm-std-aux/nm-std-aux.h
|
|
+++ b/src/libnm-std-aux/nm-std-aux.h
|
|
@@ -219,25 +219,6 @@ typedef uint64_t _nm_bitwise nm_be64_t;
|
|
#define NM_MORE_ASSERTS 0
|
|
#endif
|
|
|
|
-#if NM_MORE_ASSERTS == 0
|
|
-/* The string with the assertion check and the function name blows up the
|
|
- * binary size. In production mode, let's drop those, similar to
|
|
- * g_assertion_message_expr.
|
|
- *
|
|
- * Note that <assert.h> can be included multiple times. We can thus
|
|
- * not redefine __assert_fail(...). Instead, just redefine the name
|
|
- * __assert_fail. */
|
|
-_nm_noreturn static inline void
|
|
-_nm_assert_fail_internal(const char *assertion,
|
|
- const char *file,
|
|
- unsigned int line,
|
|
- const char *function)
|
|
-{
|
|
- __assert_fail("<dropped>", file, line, "<unknown-fcn>");
|
|
-}
|
|
-#define __assert_fail _nm_assert_fail_internal
|
|
-#endif
|
|
-
|
|
#ifndef NDEBUG
|
|
#define _NM_ASSERT_FAIL_ENABLED 1
|
|
#define _nm_assert_fail(msg) __assert_fail((msg), __FILE__, __LINE__, __func__)
|