diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-28 10:27:15 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-28 10:27:15 +0100 |
| commit | b3a50f0f3e287d63fce274e29641a3bc57405d5d (patch) | |
| tree | 1db867d2e5c40d9cd530424c022768f6f282251f /py/runtime.c | |
| parent | ed07d035d52764b3b02bfa8488f2e0445c28ea2f (diff) | |
| parent | 8993fb6cf0677ce980ab56cbad326e4e6bc47811 (diff) | |
| download | micropython-b3a50f0f3e287d63fce274e29641a3bc57405d5d.tar.gz micropython-b3a50f0f3e287d63fce274e29641a3bc57405d5d.zip | |
Merge branch 'master' into unicode
Conflicts:
py/mpconfig.h
Diffstat (limited to 'py/runtime.c')
| -rw-r--r-- | py/runtime.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/py/runtime.c b/py/runtime.c index b539984c0b..f08ff9ff40 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -45,6 +45,7 @@ #include "smallint.h" #include "objgenerator.h" #include "lexer.h" +#include "stackctrl.h" #if 0 // print debugging info #define DEBUG_PRINT (1) @@ -69,6 +70,8 @@ const mp_obj_module_t mp_module___main__ = { }; void mp_init(void) { + stack_ctrl_init(); + // call port specific initialization if any #ifdef MICROPY_PORT_INIT_FUNC MICROPY_PORT_INIT_FUNC; |