From a119c648f8219d73f4331fd53ecfb569d0ca2f45 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 23 May 2025 13:32:52 +0200 Subject: [PATCH] fundamental: Move declaration of free() to macro-fundamental.h Let's put it together with the macro that needs it (mfree()). Also, get rid of the unnecessary include in iovec-util-fundamental.h. --- src/fundamental/iovec-util-fundamental.h | 5 ----- src/fundamental/macro-fundamental.h | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/fundamental/iovec-util-fundamental.h b/src/fundamental/iovec-util-fundamental.h index 4c86197e6f7..024dd9bf78c 100644 --- a/src/fundamental/iovec-util-fundamental.h +++ b/src/fundamental/iovec-util-fundamental.h @@ -2,7 +2,6 @@ #pragma once #if !SD_BOOT -#include #include #endif @@ -15,10 +14,6 @@ struct iovec { void *iov_base; size_t iov_len; }; - -DISABLE_WARNING_REDUNDANT_DECLS; -void free(void *p); -REENABLE_WARNING; #endif /* This accepts both const and non-const pointers */ diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h index 6a75d7864a9..69bbeead483 100644 --- a/src/fundamental/macro-fundamental.h +++ b/src/fundamental/macro-fundamental.h @@ -396,6 +396,10 @@ assert_cc(sizeof(long long) == sizeof(intmax_t)); */ #define STRLEN(x) (sizeof(""x"") - sizeof(typeof(x[0]))) +DISABLE_WARNING_REDUNDANT_DECLS; +void free(void *p); +REENABLE_WARNING; + #define mfree(memory) \ ({ \ free(memory); \ -- 2.47.3