Add prototypes for strlcpy/strlcat

include/dix-config.h.in

@@ -72,6 +72,9 @@
 /* Support SHM */
 #undef HAS_SHM
 
+/* Have the 'strlcpy' function */
+#undef HAS_STRLCPY
+
 /* Define to 1 if you have the <asm/mtrr.h> header file. */
 #undef HAVE_ASM_MTRR_H
 

include/os.h

@@ -456,6 +456,11 @@ extern int xstrncasecmp(const char *s1, const char *s2, size_t n);
 extern char *xstrcasestr(const char *s, const char *find);
 #endif
 
+#ifndef HAS_STRLCPY
+extern size_t strlcpy(char *dst, const char *src, size_t siz);
+extern size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+
 /* Logging. */
 typedef enum _LogParameter {
     XLOG_FLUSH,

os/strlcat.c

@@ -21,6 +21,7 @@
 
 #include <sys/types.h>
 #include <string.h>
+#include "os.h"
 
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the

os/strlcpy.c

@@ -20,6 +20,7 @@
 
 #include <sys/types.h>
 #include <string.h>
+#include "os.h"
 
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters