From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 24 Jun 2024 14:08:50 +0000 (+0200)
Subject: macro: move PTR_TO_SIZE() macros to fundamental
X-Git-Tag: v257-rc1~1041^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515e1e6d3538d2e9efdc594186c4450fbccb44ad;p=thirdparty%2Fsystemd.git

macro: move PTR_TO_SIZE() macros to fundamental
---

diff --git a/src/basic/macro.h b/src/basic/macro.h
index 8343528e85b..7e2bc628dbf 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -211,9 +211,6 @@ static inline int __coverity_check_and_return__(int condition) {
 #define PTR_TO_UINT64(p) ((uint64_t) ((uintptr_t) (p)))
 #define UINT64_TO_PTR(u) ((void *) ((uintptr_t) (u)))
 
-#define PTR_TO_SIZE(p) ((size_t) ((uintptr_t) (p)))
-#define SIZE_TO_PTR(u) ((void *) ((uintptr_t) (u)))
-
 #define CHAR_TO_STR(x) ((char[2]) { x, 0 })
 
 #define char_array_0(x) x[sizeof(x)-1] = 0;
diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h
index 38230c5f19d..913c8b253c6 100644
--- a/src/fundamental/macro-fundamental.h
+++ b/src/fundamental/macro-fundamental.h
@@ -561,3 +561,6 @@ static inline uint64_t ALIGN_OFFSET_U64(uint64_t l, uint64_t ali) {
 
 #define FOREACH_ELEMENT(i, array)                                 \
         FOREACH_ARRAY(i, array, ELEMENTSOF(array))
+
+#define PTR_TO_SIZE(p) ((size_t) ((uintptr_t) (p)))
+#define SIZE_TO_PTR(u) ((void *) ((uintptr_t) (u)))