summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2006-11-28 20:21:54 +0000
committerThomas Heller <theller@ctypes.org>2006-11-28 20:21:54 +0000
commitef583a4992d8d7c635e77eb1a3af2b12f46fed50 (patch)
tree7d098445b35804665ac41fc2feb35c254f12ebba
parent73e7e058f5ef265278d6d184e01f134132d612fd (diff)
downloadcpython-git-ef583a4992d8d7c635e77eb1a3af2b12f46fed50.tar.gz
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.
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index a0403dec0a..b2fbe7ff18 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 1595b00a5f..55af70cd8b 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