]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Another issue #8052 bugfix (related to previous commit).
authorGregory P. Smith <greg@krypto.org>
Sat, 21 Jan 2012 23:19:11 +0000 (15:19 -0800)
committerGregory P. Smith <greg@krypto.org>
Sat, 21 Jan 2012 23:19:11 +0000 (15:19 -0800)
"oops" while rearranging the #defines.

Modules/_posixsubprocess.c

index dbb92ff2f4016c6c67043dcf1910b1e30695af76..e434d2c78a25496c30e940adb25a22e513a35f9b 100644 (file)
 # define dirent dirent64
 # if !defined(HAVE_DIRFD)
 /* Some versions of Solaris lack dirfd(). */
-#  define DIRFD(dirp) ((dirp)->dd_fd)
+#  define dirfd(dirp) ((dirp)->dd_fd)
 #  define HAVE_DIRFD
-# else
-#  define DIRFD(dirp) (dirfd(dirp))
 # endif
 #endif
 
@@ -248,7 +246,7 @@ static void _close_open_fd_range_maybe_unsafe(int start_fd, int end_fd,
     } else {
         struct dirent *dir_entry;
 #ifdef HAVE_DIRFD
-        int fd_used_by_opendir = DIRFD(proc_fd_dir);
+        int fd_used_by_opendir = dirfd(proc_fd_dir);
 #else
         int fd_used_by_opendir = start_fd - 1;
 #endif