summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2006-11-28 20:43:11 +0000
committerThomas Heller <theller@ctypes.org>2006-11-28 20:43:11 +0000
commit84a90cade58461822e7ee5bbb5e52aa6a415bd6f (patch)
treec71b677141cf50d87a72d68483f313c14fd9e49f
parent425e2d15c5b50e49e669a7a8a7316c4de21bccd9 (diff)
downloadcpython-git-84a90cade58461822e7ee5bbb5e52aa6a415bd6f.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. Backport from trunk.
-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 2d790f21e9..2e5cada0d4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,6 +70,8 @@ Core and builtins
Extension Modules
-----------------
+- Bug #1563807: _ctypes built on AIX fails with ld ffi error.
+
- Bug #1598620: A ctypes Structure cannot contain itself.
- Bug #1588217: don't parse "= " as a soft line break in binascii's
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