From 803264bb17a1dca212e427750fde2cdac98b36f0 Mon Sep 17 00:00:00 2001
From: stijn <stinos@zoho.com>
Date: Tue, 3 Mar 2015 11:15:06 +0100
Subject: [PATCH] py: Guard against redef of nlr_push with DEBUG +
MICROPY_NLR_SETJMP.
---
py/nlr.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/py/nlr.h b/py/nlr.h
index 2c09de0ba..16cab1c66 100644
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -99,6 +99,7 @@ void nlr_jump_fail(void *val);
nlr_jump(_val); \
} while (0)
+#if !MICROPY_NLR_SETJMP
#define nlr_push(val) \
assert(MP_STATE_VM(nlr_top) != val),nlr_push(val)
@@ -107,6 +108,7 @@ void nlr_jump_fail(void *val);
printf("nlr_push: before: nlr_top=%p, val=%p\n", MP_STATE_VM(nlr_top), val),assert(MP_STATE_VM(nlr_top) != val),nlr_push(val)
#endif
*/
+#endif
#endif
--
GitLab