Merge branch 'master' of git://github.com/leaflabs/libmaple

Conflicts:
	wirish/syscalls.c

1 files changed, 3 insertions, 2 deletions

diff --git a/wirish/syscalls.c b/wirish/syscalls.c
index 9a573a3..a3b6d2c 100644
--- a/wirish/syscalls.c
+++ b/wirish/syscalls.c
@@ -169,6 +169,7 @@ __weak char *fgets(char *s, int bufsize, void *f) {
     return s;
 }
 
-__weak int _exit(int exitcode) {
-    while (1);
+__weak void _exit(int exitcode) {
+    while (1)
+        ;
 }