merge

[netwatch.git] / include / minilib.h

diff --git a/include/minilib.h b/include/minilib.h
index e0fc16bfd21ab6588f964d394d198fedb225a27e..aa8bf7364d16220e854c019518178fd0479060b0 100644 (file)
--- a/include/minilib.h
+++ b/include/minilib.h
@@ -1,33 +1,20 @@
-#ifndef __MINILIB_H
-#define __MINILIB_H
+#ifndef MINILIB_H
+#define MINILIB_H
 
-#define MINILIB 1
+#include <stdarg.h>
 
-#ifndef __int8_t_defined
-# define __int8_t_defined
-typedef signed char             int8_t;
-typedef short int               int16_t;
-typedef int                     int32_t;
-# if __WORDSIZE == 64
-typedef long int                int64_t;
-# else
-__extension__
-typedef long long int           int64_t;
-# endif
-#endif
-
-/* Unsigned.  */
-typedef unsigned char           uint8_t;
-typedef unsigned short int      uint16_t;
-#ifndef __uint32_t_defined
-typedef unsigned int            uint32_t;
-# define __uint32_t_defined
-#endif
-#if __WORDSIZE == 64
-typedef unsigned long int       uint64_t;
-#else
-__extension__
-typedef unsigned long long int  uint64_t;
-#endif
+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(const char *c);
+extern void strcpy(char *a2, const char *a1);
+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