diff options
| author | Ned Deily <nad@python.org> | 2016-10-20 19:40:56 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2016-10-20 19:40:56 (GMT) |
| commit | ae8ca1c0e2878d1c0ea5b19ca25ca0ac77e1e942 (patch) | |
| tree | c650f6fae9e3ea59aa2efcb8ab20e8a71af16bf1 /Modules | |
| parent | 5246f6227aeff6b4471ab6927525ef706dbfb590 (diff) | |
| parent | 82919ec44ff49aa2343ed433705efdc76b24b5c5 (diff) | |
| download | cpython-ae8ca1c0e2878d1c0ea5b19ca25ca0ac77e1e942.zip cpython-ae8ca1c0e2878d1c0ea5b19ca25ca0ac77e1e942.tar.gz cpython-ae8ca1c0e2878d1c0ea5b19ca25ca0ac77e1e942.tar.bz2 | |
Issue #24381: merge from 3.6
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ctypes/libffi_osx/ffi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ctypes/libffi_osx/ffi.c b/Modules/_ctypes/libffi_osx/ffi.c index 96826b5..1776b79 100644 --- a/Modules/_ctypes/libffi_osx/ffi.c +++ b/Modules/_ctypes/libffi_osx/ffi.c @@ -102,7 +102,7 @@ initialize_aggregate( /* Perform machine independent ffi_cif preparation, then call machine dependent routine. */ -#if defined(X86_DARWIN) +#if defined(X86_DARWIN) && !defined __x86_64__ static inline bool struct_on_stack( @@ -125,7 +125,7 @@ struct_on_stack( } } -#endif // defined(X86_DARWIN) +#endif // defined(X86_DARWIN) && !defined __x86_64__ // Arguments' ffi_type->alignment must be nonzero. ffi_status |