traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another issue #8052 bugfix (related to previous commit). 

"oops" while rearranging the #defines.
This commit is contained in:
Gregory P. Smith 2012-01-21 15:19:11 -08:00
parent e3f7848bc5
commit e9b7cab1da
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/_posixsubprocess.c
View File

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