From db33112d4db1b8334b7b673590d2747d10cc973b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 18 Mar 2025 00:33:29 +0000 Subject: [PATCH] forkfd: fix build with FreeBSD 14.2: convertForkfdWaitFlagsToWaitFlags() The FreeBSD-specific pdfork() code in forkfd_freebsd.c code was failing to build because convertForkfdWaitFlagsToWaitFlags() wasn't defined. That function is behind a check for #ifdef HAVE_WAITID, which is only defined if _POSIX_VERSION is 2008 or later. That macro has been stuck at 2001 for the past 23 years. I can't explain how this code compiled with FreeBSD 14.1 and earlier, because I am sure it was using pdfork(). So just #define HAVE_WAITID for FreeBSD. It must have been there since much earlier than 13.0, but that seems like a reasonable starting point today. We also need to #include to have the __FreeBSD_version__ macro, something that also wasn't needed in earlier versions. It was probably indirectly #include'd by something. Pick-to: 6.8 Change-Id: I262d9922128d046221b7fffd0ec481bc0012f55c Reviewed-by: Thiago Macieira Reviewed-by: Oswald Buddenhagen (cherry picked from commit 729a6f56d08e3440f18704c1cf0b5672c0b90419) Reviewed-by: Qt Cherry-pick Bot --- src/3rdparty/forkfd/forkfd.c | 3 ++- src/3rdparty/forkfd/forkfd_freebsd.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c index edef3c5bcc8..072e4adbc8a 100644 --- a/src/3rdparty/forkfd/forkfd.c +++ b/src/3rdparty/forkfd/forkfd.c @@ -35,7 +35,7 @@ //#define FORKFD_DISABLE_FORK_FALLBACK 1 /* disable falling back to fork() from system_forkfd() */ #include -#if defined(__OpenBSD__) || defined(__NetBSD__) +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) # include #endif #include @@ -75,6 +75,7 @@ #if (defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1300000) # include # define HAVE_EVENTFD 1 +# define HAVE_WAITID 1 #endif #if (defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1000032) || \ (defined(__OpenBSD__) && OpenBSD >= 201505) || \ diff --git a/src/3rdparty/forkfd/forkfd_freebsd.c b/src/3rdparty/forkfd/forkfd_freebsd.c index ba18d835915..9cb327835c3 100644 --- a/src/3rdparty/forkfd/forkfd_freebsd.c +++ b/src/3rdparty/forkfd/forkfd_freebsd.c @@ -31,6 +31,10 @@ #undef SYSTEM_FORKFD_CAN_VFORK +#ifndef HAVE_WAITID +# error Need waitid() API +#endif + // in forkfd.c static int convertForkfdWaitFlagsToWaitFlags(int ffdoptions); static void convertStatusToForkfdInfo(int status, struct forkfd_info *info);