From 75ca66c31d86cc67fc4e49c2953d6736dd5b2da4 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Fri, 27 Mar 2026 18:37:52 +0100 Subject: [PATCH] Properly check for mkdir on Windows We have to include direct.h --- meson-cc-tests/mkdir-variant-1.c | 5 +++-- meson-cc-tests/mkdir-variant-2.c | 5 +++-- meson.build | 5 ----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/meson-cc-tests/mkdir-variant-1.c b/meson-cc-tests/mkdir-variant-1.c index 88910d107..f8da5b3b0 100644 --- a/meson-cc-tests/mkdir-variant-1.c +++ b/meson-cc-tests/mkdir-variant-1.c @@ -1,8 +1,9 @@ #ifdef HAVE_SYS_STAT_H #include #endif -#ifdef HAVE_IO_H -#include +#ifdef _WIN32 +#define _CRT_NONSTDC_NO_WARNINGS +#include #endif int main(int ac, char **av) diff --git a/meson-cc-tests/mkdir-variant-2.c b/meson-cc-tests/mkdir-variant-2.c index d0ab7b298..b41bd5e47 100644 --- a/meson-cc-tests/mkdir-variant-2.c +++ b/meson-cc-tests/mkdir-variant-2.c @@ -1,8 +1,9 @@ #ifdef HAVE_SYS_STAT_H #include #endif -#ifdef HAVE_IO_H -#include +#ifdef _WIN32 +#define _CRT_NONSTDC_NO_WARNINGS +#include #endif int main(int ac, char **av) diff --git a/meson.build b/meson.build index 584a57144..65d88caef 100644 --- a/meson.build +++ b/meson.build @@ -142,7 +142,6 @@ check_headers = [ ['fenv.h'], ['sys/wait.h'], ['sys/stat.h'], - ['io.h'], ['fenv.h', {'check-funcs': ['feenableexcept', 'fedisableexcept', 'feclearexcept']}], ['xlocale.h'], ['sys/ioctl.h'], @@ -798,10 +797,6 @@ if conf.get('HAVE_SYS_STAT_H', 0) == 1 test_mkdir_c_args += ['-DHAVE_SYS_STAT_H'] endif -if conf.get('HAVE_IO_H', 0) == 1 - test_mkdir_c_args += ['-DHAVE_IO_H'] -endif - if cc.links(files('meson-cc-tests/mkdir-variant-1.c'), args: test_mkdir_c_args) conf.set('HAVE_MKDIR', 1) elif cc.links(files('meson-cc-tests/mkdir-variant-2.c'), args: test_mkdir_c_args)