luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'non-POSIX-spawn' into 'master'

Browse Source 
Fix build failure on systems without POSIX spawn

See merge request GNOME/glib!345
This commit is contained in:
Philip Withnall 2018-09-29 09:18:15 +00:00
commit e1f4ff6c25
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -639,6 +639,7 @@ AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
AC_CHECK_HEADERS([linux/magic.h]) AC_CHECK_HEADERS([linux/magic.h])
AC_CHECK_HEADERS([termios.h]) AC_CHECK_HEADERS([termios.h])
AC_CHECK_HEADERS([alloca.h]) AC_CHECK_HEADERS([alloca.h])
AC_CHECK_HEADERS([spawn.h])
# Some versions of MSC lack these # Some versions of MSC lack these
AC_CHECK_HEADERS([dirent.h sys/time.h]) AC_CHECK_HEADERS([dirent.h sys/time.h])

3
glib/gspawn.c
View File

@ -30,7 +30,10 @@
#include <string.h> #include <string.h>
#include <stdlib.h> /* for fdwalk */ #include <stdlib.h> /* for fdwalk */
#include <dirent.h> #include <dirent.h>
#ifdef HAVE_SPAWN_H
#include <spawn.h> #include <spawn.h>
#endif /* HAVE_SPAWN_H */
#ifdef HAVE_CRT_EXTERNS_H #ifdef HAVE_CRT_EXTERNS_H
#include <crt_externs.h> /* for _NSGetEnviron */ #include <crt_externs.h> /* for _NSGetEnviron */

1
meson.build
View File

@ -227,6 +227,7 @@ headers = [
'poll.h', 'poll.h',
'pwd.h', 'pwd.h',
'sched.h', 'sched.h',
'spawn.h',
'stdint.h', 'stdint.h',
'stdlib.h', 'stdlib.h',
'string.h', 'string.h',