Issue #24381: merge from 3.5

82919ec4 · Ned Deily · e20fed91 · f536af1f · 82919ec4
Commit 82919ec4 authored Oct 20, 2016 by Ned Deily
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Modules/_ctypes/libffi_osx/ffi.c Modules/_ctypes/libffi_osx/ffi.c +2 -2

No files found.
--- 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