Merge branch 'O_CLOEXEC' into 'master'

gspawn: Fix build on systems without O_CLOEXEC

See merge request GNOME/glib!286
This commit is contained in:
Philip Withnall 2018-09-03 11:51:06 +00:00
commit 17ae9f36da

View File

@ -1485,7 +1485,7 @@ do_posix_spawn (gchar **argv,
parent_close_fds[num_parent_close_fds++] = write_null;
#ifndef HAVE_O_CLOEXEC
fcntl (read_null, F_SETFD, FD_CLOEXEC);
fcntl (write_null, F_SETFD, FD_CLOEXEC);
#endif
r = posix_spawn_file_actions_adddup2 (&file_actions, write_null, 1);
@ -1509,7 +1509,7 @@ do_posix_spawn (gchar **argv,
parent_close_fds[num_parent_close_fds++] = write_null;
#ifndef HAVE_O_CLOEXEC
fcntl (read_null, F_SETFD, FD_CLOEXEC);
fcntl (write_null, F_SETFD, FD_CLOEXEC);
#endif
r = posix_spawn_file_actions_adddup2 (&file_actions, write_null, 2);