Merge branch 'master' of postpeta.pccluster.org:mckernel

2014-09-05 17:20:50 +09:00
parent 95781d59e3 15c9ae4c8d
commit efc817de92
10 changed files with 363 additions and 142 deletions
--- a/lib/include/string.h
+++ b/lib/include/string.h
@ -29,6 +29,6 @@ int memcmp(const void *s1, const void *s2, size_t n);
 void *memset(void *s, int n, size_t l);

 unsigned long strtol(const char *cp, char **endp, unsigned int base);
-int flatten_strings(int nr_strings, char **strings, char **flat);
+int flatten_strings(int nr_strings, char *first, char **strings, char **flat);

 #endif