[Python-checkins] r52856 - in python/branches/release25-maint: Misc/NEWS Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c

[thomas.heller]

Author: thomas.heller
Date: Tue Nov 28 21:43:11 2006
New Revision: 52856

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
Log:
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.


Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Nov 28 21:43:11 2006
@@ -70,6 +70,8 @@
 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

Modified: python/branches/release25-maint/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
==============================================================================
--- python/branches/release25-maint/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c	(original)
+++ python/branches/release25-maint/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c	Tue Nov 28 21:43:11 2006
@@ -1,4 +1,4 @@
-#ifdef __ppc__
+#if !(defined(__APPLE__) && !defined(__ppc__))
 /* -----------------------------------------------------------------------
    ffi.c - Copyright (c) 1998 Geoffrey Keating