Merge branch 'microbuilder-fixes'

Conflicts:
	core/libc/string.c
This commit is contained in:
Stefan `Sec` Zehl 2011-05-21 02:11:56 +02:00
commit 8da2abcd19
1 changed files with 2 additions and 0 deletions

View File

@ -274,6 +274,8 @@ int strcmp(const char *s1, const char *s2)
return (*(unsigned char *)s1 - *(unsigned char *)--s2); return (*(unsigned char *)s1 - *(unsigned char *)--s2);
} }
char *strtok_r(char *s, const char *delim, char **last);
char *strtok(char *s, const char *delim) char *strtok(char *s, const char *delim)
{ {
static char *last; static char *last;