The branch, master has been updated via 766151bf5b7 lib:replace: Only include <sys/mount.h> on non-Linux systems via 9459f85511a Revert "lib:replace: Remove <sys/mount.h> from filesys.h" from 3aecd6e7b50 ctdb-common: CID 1507498: Control flow issues (DEADCODE)
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0 Author: Andreas Schneider <a...@samba.org> Date: Tue Aug 2 07:55:46 2022 +0200 lib:replace: Only include <sys/mount.h> on non-Linux systems Details at: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Tue Aug 2 11:05:14 UTC 2022 on sn-devel-184 commit 9459f85511a11d9a159fc8c7bb3c2d781555f87d Author: Andreas Schneider <a...@samba.org> Date: Tue Aug 2 07:55:11 2022 +0200 Revert "lib:replace: Remove <sys/mount.h> from filesys.h" This reverts commit 7a6bd2279897ed389d10f09e5b315a7bca96e7d4. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/replace/system/filesys.h | 6 ++++++ lib/replace/wscript | 3 +++ 2 files changed, 9 insertions(+) Changeset truncated at 500 lines: diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h index 190c6b90f93..bb9482c69af 100644 --- a/lib/replace/system/filesys.h +++ b/lib/replace/system/filesys.h @@ -36,10 +36,16 @@ #include <sys/param.h> #endif +/* This include is required on UNIX (*BSD, AIX, ...) for statfs() */ +#if !defined(LINUX) && defined(HAVE_SYS_MOUNT_H) +#include <sys/mount.h> +#endif + #ifdef HAVE_MNTENT_H #include <mntent.h> #endif +/* This include is required on Linux for statfs() */ #ifdef HAVE_SYS_VFS_H #include <sys/vfs.h> #endif diff --git a/lib/replace/wscript b/lib/replace/wscript index 4c774d9f0c3..dd9b19219a1 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -31,6 +31,9 @@ def configure(conf): conf.env.standalone_replace = conf.IN_LAUNCH_DIR() + if sys.platform.rfind('linux') > -1: + conf.DEFINE('LINUX', '1') + conf.DEFINE('BOOL_DEFINED', 1) conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) -- Samba Shared Repository