1 files changed, 3 insertions, 5 deletions
diff --git a/doio.c b/doio.c
index 160adc596a..56615cdd90 100644
--- a/doio.c
+++ b/doio.c
@@ -1014,12 +1014,10 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname,
 	PerlIO_clearerr(fp);
 	fd = PerlIO_fileno(fp);
     }
-#if defined(HAS_FCNTL) && defined(F_SETFD) && defined(FD_CLOEXEC)
-    if (fd >= 0 && fd > PL_maxsysfd && fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) {
-        PerlLIO_close(fd);
-        goto say_false;
+    if (fd >= 0) {
+	setfd_cloexec(fd);
+	setfd_inhexec_for_sysfd(fd);
     }
-#endif
     IoIFP(io) = fp;
 
     IoFLAGS(io) &= ~IOf_NOLINE;