[pypy-commit] cffi release-0.9: hg merge default

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: release-0.9
Changeset: r1657:cf39296d0088
Date: 2015-03-08 09:02 +0100
http://bitbucket.org/cffi/cffi/changeset/cf39296d0088/

Log:    hg merge default

diff --git a/c/malloc_closure.h b/c/malloc_closure.h
--- a/c/malloc_closure.h
+++ b/c/malloc_closure.h
@@ -125,6 +125,7 @@
     if (item == NULL)
         return;
 #else
+    {
     int prot = PROT_READ | PROT_WRITE | PROT_EXEC;
     if (is_emutramp_enabled ())
         prot &= ~PROT_EXEC;
@@ -136,6 +137,7 @@
                         0);
     if (item == (void *)MAP_FAILED)
         return;
+    }
 #endif
 
 #ifdef MALLOC_CLOSURE_DEBUG
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit