py/mpthread.h: Move GIL macros outside MICROPY_PY_THREAD block.

dpgeorge · dpgeorge · commit e90b6ce0b5af · 2016-06-28T11:28:50.000+01:00
The GIL macros are needed even if threading is not enabled.
diff --git a/py/mpthread.h b/py/mpthread.h
@@ -38,14 +38,6 @@
 
 struct _mp_state_thread_t;
 
-#if MICROPY_PY_THREAD_GIL
-#define MP_THREAD_GIL_ENTER() mp_thread_mutex_lock(&MP_STATE_VM(gil_mutex), 1)
-#define MP_THREAD_GIL_EXIT() mp_thread_mutex_unlock(&MP_STATE_VM(gil_mutex))
-#else
-#define MP_THREAD_GIL_ENTER()
-#define MP_THREAD_GIL_EXIT()
-#endif
-
 struct _mp_state_thread_t *mp_thread_get_state(void);
 void mp_thread_set_state(void *state);
 void mp_thread_create(void *(*entry)(void*), void *arg, size_t stack_size);
@@ -57,4 +49,12 @@ void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex);
 
 #endif // MICROPY_PY_THREAD
 
+#if MICROPY_PY_THREAD && MICROPY_PY_THREAD_GIL
+#define MP_THREAD_GIL_ENTER() mp_thread_mutex_lock(&MP_STATE_VM(gil_mutex), 1)
+#define MP_THREAD_GIL_EXIT() mp_thread_mutex_unlock(&MP_STATE_VM(gil_mutex))
+#else
+#define MP_THREAD_GIL_ENTER()
+#define MP_THREAD_GIL_EXIT()
+#endif
+
 #endif // __MICROPY_INCLUDED_PY_MPTHREAD_H__
