summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2013-04-30 07:05:25 (GMT)
committerGregory P. Smith <greg@krypto.org>2013-04-30 07:05:25 (GMT)
commit910bfb7bebac3e49bcdf8f08006346ee3748d1bd (patch)
treea5d69c89ab78b39f2cc58ad9f8a42b54e1b589b0
parent933059710c4fe1ada77301bdb62ce5425308c533 (diff)
downloadcpython-910bfb7bebac3e49bcdf8f08006346ee3748d1bd.zip
cpython-910bfb7bebac3e49bcdf8f08006346ee3748d1bd.tar.gz
cpython-910bfb7bebac3e49bcdf8f08006346ee3748d1bd.tar.bz2
This local change was lost during the fixing of issue17192 to update
libffi to 3.0.13. (i'm not sure if it is needed anymore but see issue 10309 for details which makes no mention of upstream; this change is already in 3.3 and 3.4 but may need reapplying to 2.7 as done here)
-rw-r--r--Modules/_ctypes/libffi/src/dlmalloc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/_ctypes/libffi/src/dlmalloc.c b/Modules/_ctypes/libffi/src/dlmalloc.c
index 5c9f9c2..2773953 100644
--- a/Modules/_ctypes/libffi/src/dlmalloc.c
+++ b/Modules/_ctypes/libffi/src/dlmalloc.c
@@ -457,6 +457,11 @@ DEFAULT_MMAP_THRESHOLD default: 256K
#define LACKS_ERRNO_H
#define MALLOC_FAILURE_ACTION
#define MMAP_CLEARS 0 /* WINCE and some others apparently don't clear */
+#elif !defined _GNU_SOURCE
+/* mremap() on Linux requires this via sys/mman.h
+ * See roundup issue 10309
+ */
+#define _GNU_SOURCE 1
#endif /* WIN32 */
#ifdef __OS2__