[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r76375:d4b0ff9d6c33
Date: 2015-03-14 19:44 +0100
http://bitbucket.org/pypy/pypy/changeset/d4b0ff9d6c33/

Log:    merge heads

diff --git a/rpython/translator/c/src/mem.c b/rpython/translator/c/src/mem.c
--- a/rpython/translator/c/src/mem.c
+++ b/rpython/translator/c/src/mem.c
@@ -29,9 +29,9 @@
 RPY_EXTERN
 void pypy_debug_alloc_stop(void *addr)
 {
+  struct pypy_debug_alloc_s **p;
   if (!addr)
        return;
-  struct pypy_debug_alloc_s **p;
   for (p = &pypy_debug_alloc_list; *p; p = &((*p)->next))
     if ((*p)->addr == addr)
       {
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit