[pypy-commit] stmgc card-marking: fix for last commit

[Raemi]

Author: Remi Meier <remi.meier at inf.ethz.ch>
Branch: card-marking
Changeset: r1221:bdd0e55e018f
Date: 2014-05-20 15:54 +0200
http://bitbucket.org/pypy/stmgc/changeset/bdd0e55e018f/

Log:	fix for last commit

diff --git a/c7/stm/nursery.c b/c7/stm/nursery.c
--- a/c7/stm/nursery.c
+++ b/c7/stm/nursery.c
@@ -326,6 +326,10 @@
 
 static size_t throw_away_nursery(struct stm_priv_segment_info_s *pseg)
 {
+#pragma push_macro("STM_PSEGMENT")
+#pragma push_macro("STM_SEGMENT")
+#undef STM_PSEGMENT
+#undef STM_SEGMENT
     /* reset the nursery by zeroing it */
     size_t nursery_used;
     char *realnursery;
@@ -360,12 +364,14 @@
 
     tree_clear(pseg->nursery_objects_shadows);
 
-    if (STM_PSEGMENT->old_objects_with_cards) {
-        LIST_FOREACH_R(STM_PSEGMENT->old_objects_with_cards, object_t * /*item*/,
+    if (pseg->old_objects_with_cards) {
+        LIST_FOREACH_R(pseg->old_objects_with_cards, object_t * /*item*/,
                        _reset_cards(item));
     }
 
     return nursery_used;
+#pragma pop_macro("STM_SEGMENT")
+#pragma pop_macro("STM_PSEGMENT")
 }
 
 #define MINOR_NOTHING_TO_DO(pseg)                                       \