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.

diff --git a/Misc/NEWS b/Misc/NEWS
index 2d790f21e9537dd9ae2400838f555019488b66ed..2e5cada0d417e696c1fbe6ba560d001a44395e29 100644 (file)
--- 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 1595b00a5ff1dcfcb7296482aba426db721bbec7..55af70cd8b2d174e059c7acbb2fb364dadd3563d 100644 (file)
--- 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