Guard against strlcpy()/strlcat() being implemented as macros

util.h

@@ -14,6 +14,8 @@ void eprintf(const char *, ...);
 long estrtol(const char *, int);
 void putword(const char *);
 void recurse(const char *, void (*)(const char *));
+#undef strlcat
 size_t strlcat(char *, const char *, size_t);
+#undef strlcpy
 size_t strlcpy(char *, const char *, size_t);
 char *ttytostr(int, int);

util/strlcat.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include "../util.h"
 
 size_t
 strlcat(char *dest, const char *src, size_t count)

util/strlcpy.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include "../util.h"
 
 size_t
 strlcpy(char *dest, const char *src, size_t size)