merge

diff --cc include/minilib.h
index 0f5edff26ca37725b4f72321860cb03e159882ac,b583046bd9d74d263ceb39ebcb1f451b91d7fd55..aa8bf7364d16220e854c019518178fd0479060b0
--- 1/include/minilib.h
--- 2/include/minilib.h
+++ b/include/minilib.h
@@@ -1,20 -1,13 +1,20 @@@
  #ifndef MINILIB_H
  #define MINILIB_H
  
 -void memcpy(void *dest, void *src, int bytes);
 -void memmove(void *dest, void *src, int bytes);
 -int strcmp(const char *a2, const char *a1);
 -void strcpy(char *a2, const char *a1);
 -void tohex(char *s, unsigned long l);
 +#include <stdarg.h>
  
 -void puts(const char *c);
 -void puthex(unsigned long l);
 +extern void memcpy(void *dest, void *src, int bytes);
 +extern void memmove(void *dest, void *src, int bytes);
 +extern int memcmp(const char *a2, const char *a1, int bytes);
 +extern int strcmp(const char *a2, const char *a1);
- extern int strlen(char *c);
++extern int strlen(const char *c);
 +extern void strcpy(char *a2, const char *a1);
- extern void puts(char *c);
++extern void puts(const char *c);
 +extern void tohex(char *s, unsigned long l);
 +extern void puthex(unsigned long l);
 +extern int vsprintf(char *s, const char *fmt, va_list args);
 +extern int vsnprintf(char *s, int size, const char *fmt, va_list args);
 +extern int sprintf(char *s, const char *fmt, ...);
 +extern int snprintf(char *s, int size, const char *fmt, ...);
  
  #endif

diff --cc lib/minilib.c
Simple merge