From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 21 Jul 2025 18:37:37 +0000 (+0900)
Subject: musl: avoid conflict between fcntl.h and basic-forward.h
X-Git-Tag: v259-rc1~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43e4c91fc0ccf290a1b326038b5982308aee693b;p=thirdparty%2Fsystemd.git

musl: avoid conflict between fcntl.h and basic-forward.h

glibc defines AT_FDCWD as -100, but musl defines it as (-100).
In basic-forward.h, we also define AT_FDCWD as -100, hence musl's fcntl.h
conflicts with forward.h. This is for avoiding the conflict.
---

diff --git a/src/basic/basic-forward.h b/src/basic/basic-forward.h
index 38c3098f324..dae8788140f 100644
--- a/src/basic/basic-forward.h
+++ b/src/basic/basic-forward.h
@@ -117,7 +117,12 @@ typedef struct SocketAddress SocketAddress;
 /* We duplicate various commonly used constants here so we can keep most static inline functions without
  * having to include the full header that provides these constants. */
 
+/* glibc defines AT_FDCWD as -100, but musl defines it as (-100). */
+#ifdef __GLIBC__
 #define AT_FDCWD                -100
+#else
+#define AT_FDCWD                (-100)
+#endif
 #define AT_EMPTY_PATH           0x1000
 #define AT_SYMLINK_FOLLOW       0x400
 #define AT_SYMLINK_NOFOLLOW     0x100