From e3bd9a65ccc3139eb1a79791bd0dd649fb053bfd Mon Sep 17 00:00:00 2001 From: Congcong Kuo Date: Sun, 25 May 2025 22:22:50 +0800 Subject: [PATCH] =?UTF-8?q?daemon:=20Remove=20=E2=80=98defined=E2=80=99=20?= =?UTF-8?q?in=20macro=20definition.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #6. * nix/libstore/build.cc (CHROOT_ENABLED, CLONE_ENABLED): Wrap in #ifdefs. Change-Id: I217e46fc2cac579a199fcd7c28ef5a8155a12750 Signed-off-by: Ludovic Courtès --- nix/libstore/build.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index a1f39d9a8bf..9701af8079e 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -55,8 +55,17 @@ #endif -#define CHROOT_ENABLED HAVE_CHROOT && HAVE_SYS_MOUNT_H && defined(MS_BIND) && defined(MS_PRIVATE) -#define CLONE_ENABLED defined(CLONE_NEWNS) +#if defined(MS_BIND) && defined(MS_PRIVATE) +#define CHROOT_ENABLED HAVE_CHROOT && HAVE_SYS_MOUNT_H +#else +#define CHROOT_ENABLED 0 +#endif + +#if defined(CLONE_NEWNS) +#define CLONE_ENABLED 1 +#else +#define CLONE_ENABLED 0 +#endif #if defined(SYS_pivot_root) #define pivot_root(new_root, put_old) (syscall(SYS_pivot_root, new_root,put_old))