From d0109bed16ebbec90f11e68464d9244fcede9250 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 2 Dec 2025 16:38:42 +0100 Subject: [PATCH] Move unistd.h detection to the correct wscript This fixes macOS builds (getpid()) --- gtk2_ardour/nsmclient.cc | 1 - gtk2_ardour/wscript | 2 ++ libs/ardour/wscript | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/nsmclient.cc b/gtk2_ardour/nsmclient.cc index 4bcd7b43ad..7df9b7fcf3 100644 --- a/gtk2_ardour/nsmclient.cc +++ b/gtk2_ardour/nsmclient.cc @@ -29,7 +29,6 @@ #ifndef COMPILER_MSVC #pragma GCC diagnostic ignored "-Wunused-parameter" #else -#include // Needed for 'getpid()' #include #define LO_TT_IMMEDIATE lo_get_tt_immediate() diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index be9cb36b81..1bcf456152 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -492,6 +492,8 @@ def configure(conf): autowaf.check_pkg(conf, 'pangoft2', uselib_store='PANGOFT2', atleast_version='1.36.8', mandatory=False) autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG') + conf.check(header_name='unistd.h', define_name='HAVE_UNISTD_H',mandatory=False) + if conf.env.CC_NAME == 'gcc' and Options.options.strict: conf.define('GLIB_DISABLE_DEPRECATION_WARNINGS', 1) for var in ['CFLAGS', 'CXXFLAGS']: diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 1f940d57c7..b6b55fb697 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -341,7 +341,6 @@ def configure(conf): conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False) conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False) - conf.check(header_name='unistd.h', define_name='HAVE_UNISTD_H',mandatory=False) have_sys_ioprio = conf.check_cc( msg="Checking for 'ioprio_set' syscall support",