Issue #24381: merge from 3.5

This commit is contained in:
Ned Deily 2016-10-20 15:40:22 -04:00
commit 82919ec44f

View file

@ -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