changeset:   74568:5be3dadd2eef
branch:      3.2
user:        Gregory P. Smith <greg@krypto.org>
date:        Sat Jan 21 15:19:11 2012 -0800
files:       Modules/_posixsubprocess.c
description:
Another issue #8052 bugfix (related to previous commit).
"oops" while rearranging the #defines.


diff -r d0acd8169c2a -r 5be3dadd2eef Modules/_posixsubprocess.c
--- a/Modules/_posixsubprocess.c	Sat Jan 21 15:16:17 2012 -0800
+++ b/Modules/_posixsubprocess.c	Sat Jan 21 15:19:11 2012 -0800
@@ -21,10 +21,8 @@
 # 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 @@
     } 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