diff options
| author | Gregory P. Smith <greg@krypto.org> | 2012-06-05 20:26:39 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2012-06-05 20:26:39 (GMT) |
| commit | 58f07a9d6d2aa7b5d624ef23cc89c99071fa249f (patch) | |
| tree | 175abda7fec2e6b99e77efb544e56378037db80e /Modules/_posixsubprocess.c | |
| parent | 2d7d56abf84b8fa0ed425c01b1cae62918fd850a (diff) | |
| download | cpython-58f07a9d6d2aa7b5d624ef23cc89c99071fa249f.zip cpython-58f07a9d6d2aa7b5d624ef23cc89c99071fa249f.tar.gz cpython-58f07a9d6d2aa7b5d624ef23cc89c99071fa249f.tar.bz2 | |
Fixes issue #15000: support the odd x32 abi on posixsubprocess's system call.
Diffstat (limited to 'Modules/_posixsubprocess.c')
| -rw-r--r-- | Modules/_posixsubprocess.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c index 81274e1..21ad966 100644 --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -175,8 +175,15 @@ _close_fds_by_brute_force(int start_fd, int end_fd, PyObject *py_fds_to_keep) * chooses to break compatibility with all existing binaries. Highly Unlikely. */ struct linux_dirent { +#if defined(__x86_64__) && defined(__ILP32__) + /* Support the wacky x32 ABI (fake 32-bit userspace speaking to x86_64 + * kernel interfaces) - https://sites.google.com/site/x32abi/ */ + unsigned long long d_ino; + unsigned long long d_off; +#else unsigned long d_ino; /* Inode number */ unsigned long d_off; /* Offset to next linux_dirent */ +#endif unsigned short d_reclen; /* Length of this linux_dirent */ char d_name[256]; /* Filename (null-terminated) */ }; |