[Python-checkins] cpython (3.3): Issue #18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke

[christian.heimes]

http://hg.python.org/cpython/rev/f09ca52747a6
changeset:   85223:f09ca52747a6
branch:      3.3
parent:      85221:e07f104133d5
user:        Christian Heimes <christian at cheimes.de>
date:        Sat Aug 17 15:01:54 2013 +0200
summary:
  Issue #18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke malloc weak symbols.

files:
  Misc/NEWS                              |  3 +++
  Modules/_ctypes/libffi/fficonfig.py.in |  1 -
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,9 @@
 Library
 -------
 
+- Issue #18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke
+  malloc weak symbols.
+
 - Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
   inside subjectAltName correctly. Formerly the module has used OpenSSL's
   GENERAL_NAME_print() function to get the string represention of ASN.1
diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in
--- a/Modules/_ctypes/libffi/fficonfig.py.in
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -1,7 +1,6 @@
 ffi_sources = """
 src/prep_cif.c
 src/closures.c
-src/dlmalloc.c
 """.split()
 
 ffi_platforms = {

-- 
Repository URL: http://hg.python.org/cpython