py: Fix some macros defines; cleanup some includes.

2014-11-05 21:16:41 +00:00
parent be8e99c7d4
commit 7860c2a68a
11 changed files with 14 additions and 14 deletions
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -36,7 +36,7 @@ struct _nlr_buf_t {
    // the entries here must all be machine word size
    nlr_buf_t *prev;
    void *ret_val;
-#if !MICROPY_NLR_SETJMP
+#if !defined(MICROPY_NLR_SETJMP) || !MICROPY_NLR_SETJMP
 #if defined(__i386__)
    void *regs[6];
 #elif defined(__x86_64__)