Author: Armin Rigo <[email protected]>
Branch:
Changeset: r73824:7ee38900bceb
Date: 2014-10-06 10:42 +0200
http://bitbucket.org/pypy/pypy/changeset/7ee38900bceb/
Log: Issue #1881: tentative fix
diff --git a/rpython/rlib/rmmap.py b/rpython/rlib/rmmap.py
--- a/rpython/rlib/rmmap.py
+++ b/rpython/rlib/rmmap.py
@@ -134,8 +134,8 @@
if _CYGWIN:
# XXX: macro=True hack for newer versions of Cygwin (as of 12/2012)
- c_malloc, _ = external('malloc', [size_t], PTR, macro=True)
- c_free, _ = external('free', [PTR], lltype.Void, macro=True)
+ _, c_malloc_safe = external('malloc', [size_t], PTR, macro=True)
+ _, c_free_safe = external('free', [PTR], lltype.Void, macro=True)
c_memmove, _ = external('memmove', [PTR, PTR, size_t], lltype.Void)
@@ -709,7 +709,7 @@
# XXX: JIT memory should be using mmap MAP_PRIVATE with
# PROT_EXEC but Cygwin's fork() fails. mprotect()
# cannot be used, but seems to be unnecessary there.
- res = c_malloc(map_size)
+ res = c_malloc_safe(map_size)
if res == rffi.cast(PTR, 0):
raise MemoryError
return res
@@ -726,7 +726,7 @@
alloc._annenforceargs_ = (int,)
if _CYGWIN:
- free = c_free
+ free = c_free_safe
else:
free = c_munmap_safe
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
