luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-15 22:53:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'O_CLOEXEC' into 'master'

Browse Source 
gspawn: Fix build on systems without O_CLOEXEC

See merge request
This commit is contained in:
Philip Withnall
2018-09-03 11:51:06 +00:00
parent f63bc3072c 769b9a9c37
commit 17ae9f36da
1 changed files with 2 additions and 2 deletions

4
glib/gspawn.c

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