From e9b7cab1da131f26e0a04900718a39da962b82e1 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Sat, 21 Jan 2012 15:19:11 -0800 Subject: Another issue #8052 bugfix (related to previous commit). "oops" while rearranging the #defines. --- Modules/_posixsubprocess.c | 6 ++---- 1 file 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 -- cgit v0.12