diff --git a/liba/Makefile b/liba/Makefile index 5003c691c..7893b8a3d 100644 --- a/liba/Makefile +++ b/liba/Makefile @@ -2,4 +2,4 @@ SFLAGS += -Iliba/include liba/src/external/sqlite/mem5.o: CFLAGS += -w -objs += $(addprefix liba/src/, assert.o errno.o malloc.o memcpy.o memset.o external/sqlite/mem5.o) +objs += $(addprefix liba/src/, assert.o errno.o malloc.o memcpy.o memset.o strlen.o external/sqlite/mem5.o) diff --git a/liba/include/string.h b/liba/include/string.h index 929b69733..0f3e325ab 100644 --- a/liba/include/string.h +++ b/liba/include/string.h @@ -10,7 +10,6 @@ LIBA_BEGIN_DECLS void * memcpy(void * dst, const void * src, size_t n); void * memset(void * b, int c, size_t len); - size_t strlen(const char * s); LIBA_END_DECLS diff --git a/liba/src/strlen.c b/liba/src/strlen.c new file mode 100644 index 000000000..68fd1b576 --- /dev/null +++ b/liba/src/strlen.c @@ -0,0 +1,8 @@ +#include + +size_t strlen(const char * s) { + const char * str = s; + while (*str) + str++; + return str - s; +} diff --git a/platform/fx92kbd/fx92kbd.c b/platform/fx92kbd/fx92kbd.c index 5d295e5e5..0c2a9b07d 100644 --- a/platform/fx92kbd/fx92kbd.c +++ b/platform/fx92kbd/fx92kbd.c @@ -9,7 +9,7 @@ void fx92kbd_initialize(fx92kbd_t * controller) { } //FIXME! -static int delay(int usec) { +static void delay(int usec) { for (int i=0; i