diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-02-02 13:13:29 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-02-02 13:13:29 +0000 |
| commit | 09e1f43200ec28082456042a58d9f39f483f3ad0 (patch) | |
| tree | a61fff4a0fbad891177d64bf311c9cb0882b4e1b /unix/main.c | |
| parent | cd82e02e84df5f9f2f3082d865beae25217af2a1 (diff) | |
| parent | ea2509d92cbb222854ceb0b323b616b807dd221b (diff) | |
| download | micropython-09e1f43200ec28082456042a58d9f39f483f3ad0.tar.gz micropython-09e1f43200ec28082456042a58d9f39f483f3ad0.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'unix/main.c')
| -rw-r--r-- | unix/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/unix/main.c b/unix/main.c index 5ca8115368..cc942163f9 100644 --- a/unix/main.c +++ b/unix/main.c @@ -24,6 +24,7 @@ extern const mp_obj_fun_native_t mp_builtin_open_obj; void file_init(); void rawsocket_init(); +void time_init(); void ffi_init(); static void execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, bool is_repl) { @@ -242,6 +243,9 @@ int main(int argc, char **argv) { file_init(); rawsocket_init(); +#if MICROPY_MOD_TIME + time_init(); +#endif #if MICROPY_MOD_FFI ffi_init(); #endif |