diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
| commit | aaa6c8a6cefff2fc8938453f09fb91523b9e87e4 (patch) | |
| tree | fd186e3ee9ba0c4d514baa27d78b8553bcedcb70 /Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c | |
| parent | faf291a9c41cc2a4ffa6797c1d35c7863118a4c4 (diff) | |
| parent | d64ee80d6bfb97a63953796074e792f4883e5fb2 (diff) | |
| download | CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.zip CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.gz CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.bz2 | |
Merge branch 'master' into doc-singlehtml
Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help
options from both sides.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c b/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c index a13dbbf..94eb5e7 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c @@ -1973,7 +1973,7 @@ tree_dup(int fd) static volatile int can_dupfd_cloexec = 1; if (can_dupfd_cloexec) { - new_fd = fcntl(fd, F_DUPFD_CLOEXEC); + new_fd = fcntl(fd, F_DUPFD_CLOEXEC, 0); if (new_fd != -1) return (new_fd); /* Linux 2.6.18 - 2.6.23 declare F_DUPFD_CLOEXEC, |