From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 23 Jun 2025 03:02:50 +0000 (+0900)
Subject: include: make system headers self contained
X-Git-Tag: v258-rc1~235^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d765eee15483bd1f7487e3937093f7905601e7f;p=thirdparty%2Fsystemd.git

include: make system headers self contained

Let's not include any non-system headers in system headers.
---

diff --git a/src/basic/include/malloc.h b/src/basic/include/malloc.h
index 96051805438..d0080b6cbc0 100644
--- a/src/basic/include/malloc.h
+++ b/src/basic/include/malloc.h
@@ -3,8 +3,6 @@
 
 #include_next <malloc.h>
 
-#include "macro.h"
-
 #if !HAVE_MALLINFO2
 struct mallinfo2 {
         size_t arena;    /* non-mmapped space allocated from system */
@@ -20,9 +18,10 @@ struct mallinfo2 {
 };
 
 static inline struct mallinfo2 mallinfo2(void) {
-DISABLE_WARNING_DEPRECATED_DECLARATIONS
+        _Pragma("GCC diagnostic push");
+        _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"");
         struct mallinfo m = mallinfo();
-REENABLE_WARNING
+        _Pragma("GCC diagnostic pop");
 
         return (struct mallinfo2) {
                 .arena = m.arena,