From ef583a4992d8d7c635e77eb1a3af2b12f46fed50 Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Tue, 28 Nov 2006 20:21:54 +0000 Subject: [PATCH] Fix #1563807: _ctypes built on AIX fails with ld ffi error. The contents of ffi_darwin.c must be compiled unless __APPLE__ is defined and __ppc__ is not. Will backport. --- Misc/NEWS | 2 ++ Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index a0403dec0a2..b2fbe7ff18b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -101,6 +101,8 @@ Core and builtins Library ------- +- Bug #1563807: _ctypes built on AIX fails with ld ffi error. + - Bug #1598620: A ctypes Structure cannot contain itself. - Patch #1362975: Rework CodeContext indentation algorithm to diff --git a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c index 1595b00a5ff..55af70cd8b2 100644 --- a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c +++ b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c @@ -1,4 +1,4 @@ -#ifdef __ppc__ +#if !(defined(__APPLE__) && !defined(__ppc__)) /* ----------------------------------------------------------------------- ffi.c - Copyright (c) 1998 Geoffrey Keating