2 files changed, 1 insertions, 11 deletions

diff --git a/src/filelock.c b/src/filelock.c
index 3d6941695ae..fec9bc044ae 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -403,8 +403,6 @@ create_lock_file (char *lfname, char *lock_info_str, bool force)
       else
         {
           ptrdiff_t lock_info_len;
-          if (! O_CLOEXEC)
-            fcntl (fd, F_SETFD, FD_CLOEXEC);
           lock_info_len = strlen (lock_info_str);
           err = 0;
           if (emacs_write (fd, lock_info_str, lock_info_len) != lock_info_len
diff --git a/src/sysdep.c b/src/sysdep.c
index 2e18a419e3f..12e9c83ee90 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2393,8 +2393,6 @@ emacs_open (const char *file, int oflags, int mode)
   oflags |= O_CLOEXEC;
   while ((fd = open (file, oflags, mode)) < 0 && errno == EINTR)
     maybe_quit ();
-  if (! O_CLOEXEC && 0 <= fd)
-    fcntl (fd, F_SETFD, FD_CLOEXEC);
   return fd;
 }
 
@@ -2436,13 +2434,7 @@ emacs_pipe (int fd[2])
 #ifdef MSDOS
   return pipe (fd);
 #else  /* !MSDOS */
-  int result = pipe2 (fd, O_BINARY | O_CLOEXEC);
-  if (! O_CLOEXEC && result == 0)
-    {
-      fcntl (fd[0], F_SETFD, FD_CLOEXEC);
-      fcntl (fd[1], F_SETFD, FD_CLOEXEC);
-    }
-  return result;
+  return pipe2 (fd, O_BINARY | O_CLOEXEC);
 #endif  /* !MSDOS */
 }