summaryrefslogtreecommitdiff
path: root/Modules/_ctypes
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-10-20 15:40:22 -0400
committerNed Deily <nad@python.org>2016-10-20 15:40:22 -0400
commitb1c6998f84e7ce869a7f87b33bbb5eec0f55c9c1 (patch)
tree47f7fd58bff1c2a6ad43f42f9e134ab2532070cb /Modules/_ctypes
parentcae14a6525525eb53dacd687a76cd676c14df119 (diff)
parent842027f322155ce77db74fd1a30d2932c98d478c (diff)
downloadcpython-b1c6998f84e7ce869a7f87b33bbb5eec0f55c9c1.tar.gz
Issue #24381: merge from 3.5
Diffstat (limited to 'Modules/_ctypes')
-rw-r--r--Modules/_ctypes/libffi_osx/ffi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ctypes/libffi_osx/ffi.c b/Modules/_ctypes/libffi_osx/ffi.c
index 96826b5c8e..1776b795e2 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