summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-01-21 23:19:11 (GMT)
committerGregory P. Smith <greg@krypto.org>2012-01-21 23:19:11 (GMT)
commite9b7cab1da131f26e0a04900718a39da962b82e1 (patch)
treea2078242d5ef3fc83df9c1f3af49c945066386d0 /Modules
parente3f7848bc5ee926810d67bb7e6457555cca2bb05 (diff)
downloadcpython-e9b7cab1da131f26e0a04900718a39da962b82e1.zip
cpython-e9b7cab1da131f26e0a04900718a39da962b82e1.tar.gz
cpython-e9b7cab1da131f26e0a04900718a39da962b82e1.tar.bz2
Another issue #8052 bugfix (related to previous commit).
"oops" while rearranging the #defines.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_posixsubprocess.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index dbb92ff..e434d2c 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -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 @@ 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