[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #24381: merge from 3.5
ned.deily
python-checkins at python.org
Thu Oct 20 15:42:57 EDT 2016
https://hg.python.org/cpython/rev/c60d41590054
changeset: 104585:c60d41590054
branch: 3.6
parent: 104582:5023c182a8a4
parent: 104584:2b089035a453
user: Ned Deily <nad at python.org>
date: Thu Oct 20 15:40:22 2016 -0400
summary:
Issue #24381: merge from 3.5
files:
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
--- a/Modules/_ctypes/libffi_osx/ffi.c
+++ b/Modules/_ctypes/libffi_osx/ffi.c
@@ -102,7 +102,7 @@
/* 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 @@
}
}
-#endif // defined(X86_DARWIN)
+#endif // defined(X86_DARWIN) && !defined __x86_64__
// Arguments' ffi_type->alignment must be nonzero.
ffi_status
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list