diff options
| author | blmorris <bryan.morrissey@gmail.com> | 2014-07-18 16:06:22 -0400 |
|---|---|---|
| committer | blmorris <bryan.morrissey@gmail.com> | 2014-07-18 16:06:22 -0400 |
| commit | 0f4ee2e44a1e47258a8b07fb25e28286d131390c (patch) | |
| tree | 7bfb507183544d14236c0be8a232a92f4113abb1 /teensy/main.c | |
| parent | 0429d35f37532d2a981e704f014a248da9b157d8 (diff) | |
| parent | 5467186b0eaa6e856b00f60f807bb988ae2ef8c5 (diff) | |
Merge https://github.com/micropython/micropython
Diffstat (limited to 'teensy/main.c')
| -rw-r--r-- | teensy/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/teensy/main.c b/teensy/main.c index 5e7918cdc..fdedff89c 100644 --- a/teensy/main.c +++ b/teensy/main.c @@ -3,8 +3,8 @@ #include <string.h> #include <stdlib.h> -#include "misc.h" #include "mpconfig.h" +#include "misc.h" #include "qstr.h" #include "nlr.h" #include "lexer.h" @@ -39,7 +39,7 @@ void flash_error(int n) { } } -void __fatal_error(const char *msg) { +void NORETURN __fatal_error(const char *msg) { for (volatile uint delay = 0; delay < 10000000; delay++) { } led_state(1, 1); |