[Python-checkins] cpython (merge 3.6 -> default): Issue #24381: merge from 3.6

[ned.deily]

https://hg.python.org/cpython/rev/59838bede1de
changeset:   104586:59838bede1de
parent:      104583:3c4833d2fdbe
parent:      104585:c60d41590054
user:        Ned Deily <nad at python.org>
date:        Thu Oct 20 15:40:56 2016 -0400
summary:
  Issue #24381: merge from 3.6

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