diff options
| author | stijn <stinos@zoho.com> | 2015-03-03 11:15:06 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-03-03 14:34:40 +0000 |
| commit | 803264bb17a1dca212e427750fde2cdac98b36f0 (patch) | |
| tree | db72514adb467c1f73db3a84f1a3b42eb865bec6 /py | |
| parent | 9be0d599cd46fb01838cf14207c3d9a1195ceb35 (diff) | |
| download | micropython-803264bb17a1dca212e427750fde2cdac98b36f0.tar.gz micropython-803264bb17a1dca212e427750fde2cdac98b36f0.zip | |
py: Guard against redef of nlr_push with DEBUG + MICROPY_NLR_SETJMP.
Diffstat (limited to 'py')
| -rw-r--r-- | py/nlr.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 |