| commit | 3e21390532c5f3e662acf0652ffa321e65d4dd2d | [log] [tgz] |
|---|---|---|
| author | PulkoMandy <pulkomandy@pulkomandy.tk> | jeu. juin 26 11:08:29 2014 +0200 |
| committer | PulkoMandy <pulkomandy@pulkomandy.tk> | jeu. juin 26 11:08:29 2014 +0200 |
| tree | 14dadc75214bb1f8047a73c8aa873a8a851e3232 | |
| parent | 506f7559de7c417f68a4ae735ed62675aedb1686 [diff] [blame] |
Fix various mismatched prototypes and other compilation problems. Core (make cpc) builds again, but crashes on startup.
diff --git a/contiki/ctk/ctk.c b/contiki/ctk/ctk.c index 2523d1e..b54e823 100644 --- a/contiki/ctk/ctk.c +++ b/contiki/ctk/ctk.c
@@ -1231,8 +1231,8 @@ register char *cptr, *cptr2; static unsigned char len, txpos, typos, tlen; - if(t->input != NULL && t->input(c, t)) { - return; + if(t->input != NULL && t->input(c, (void*)t)) { + return; } txpos = t->xpos;