Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r59474:a59a3dd9ee87
Date: 2012-12-17 23:53 +0100
http://bitbucket.org/pypy/pypy/changeset/a59a3dd9ee87/
Log: Left behind in previous merge
diff --git a/pypy/translator/c/src/mem.h b/pypy/translator/c/src/mem.h
--- a/pypy/translator/c/src/mem.h
+++ b/pypy/translator/c/src/mem.h
@@ -134,6 +134,7 @@
#ifndef OP_BOEHM_ZERO_MALLOC /* may be defined already by src_stm/et.h */
#define OP_BOEHM_ZERO_MALLOC(size, r, restype, is_atomic, is_varsize) \
r = (restype) calloc(1, size);
+#endif
#define OP_BOEHM_DISAPPEARING_LINK(link, obj, r) /* nothing */
#define OP_GC__DISABLE_FINALIZERS(r) /* nothing */
#define OP_GC__ENABLE_FINALIZERS(r) /* nothing */
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
