<usual/string.h>

diff --git a/include/bouncer.h b/include/bouncer.h
index 76d2437c894c05948464ddd8b6a4c24a817e7c44..c23098f573df5890a7be4b34df392395a53f9095 100644 (file)
--- a/include/bouncer.h
+++ b/include/bouncer.h
@@ -25,6 +25,7 @@
 #include <usual/time.h>
 #include <usual/list.h>
 #include <usual/statlist.h>
+#include <usual/string.h>
 
 #include <event.h>
 

diff --git a/include/system.h b/include/system.h
index d91444c8c72abff3c7fe7841fc528a46b25cc3e2..5adfe9b708428456d1e39528127fc4bc3f9e2862 100644 (file)
--- a/include/system.h
+++ b/include/system.h
@@ -49,7 +49,6 @@
 
 #include <fcntl.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <limits.h>
@@ -117,18 +116,9 @@ do { \
  * libc compat functions.
  */
 
-#ifndef HAVE_STRLCPY
-size_t strlcpy(char *dst, const char *src, size_t n) _MUSTCHECK;
-#endif
-#ifndef HAVE_STRLCAT
-size_t strlcat(char *dst, const char *src, size_t n) _MUSTCHECK;
-#endif
 #ifndef HAVE_GETPEEREID
 int getpeereid(int fd, uid_t *uid_p, gid_t *gid_p) _MUSTCHECK;
 #endif
-#ifndef HAVE_BASENAME
-const char *basename(const char *path);
-#endif
 #ifndef HAVE_CRYPT
 static inline char *crypt(const char *p, const char *s) { return NULL; }
 #endif