From: Chun-wei Fan Date: Wed, 26 Jan 2022 05:07:29 +0000 (+0800) Subject: gobject-introspection: Don't include unistd.h on MSVC X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d8b2bde7aa97f12e3c636cf7707761f0053a09c;p=thirdparty%2Fvala.git gobject-introspection: Don't include unistd.h on MSVC Visual Studio does not come with this header, so don't try to include it in C code when building for Visual Studio. --- diff --git a/gobject-introspection/meson.build b/gobject-introspection/meson.build index 0318aac80..1319b5bd2 100644 --- a/gobject-introspection/meson.build +++ b/gobject-introspection/meson.build @@ -35,10 +35,17 @@ gen_introspect_sources = files( 'scanner.c', ) +extra_gen_introspect_c_args = [] + +if cc.get_argument_syntax() == 'msvc' + extra_gen_introspect_c_args += '-DYY_NO_UNISTD_H' +endif + gen_introspect_name = 'gen-introspect@0@'.format(vala_version_suffix) gen_introspect_exe = executable(gen_introspect_name, [gen_introspect_sources, lfiles, pfiles], + c_args: extra_gen_introspect_c_args, install: true, install_dir: pkglibdir, dependencies: [gobject_dep, gmodule_dep, gidl_dep], diff --git a/gobject-introspection/scanner.c b/gobject-introspection/scanner.c index 58133f968..de28c282e 100644 --- a/gobject-introspection/scanner.c +++ b/gobject-introspection/scanner.c @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include "grealpath.h" #ifndef _WIN32 +#include #include /* waitpid */ #endif