From: Christian Heimes <christian@cheimes.de>
Date: Sat, 17 Aug 2013 13:01:54 +0000 (+0200)
Subject: Issue #18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke malloc... 
X-Git-Tag: v3.4.0a2~198^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ff79f7c46fc13bb0855d33ab75acd578a950abf;p=thirdparty%2FPython%2Fcpython.git

Issue #18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke malloc weak symbols.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index b423b8b738c3..edb2fd9dba02 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,9 @@ Core and Builtins
 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
index 5a7fd083add9..35be29cb3a69 100644
--- 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 = {