Imported Upstream version 1.8.7

[debian/sudo] / compat / strlcat.c

diff --git a/compat/strlcat.c b/compat/strlcat.c
index 57e3ca51ed208c1d5a0bc6346030d1aa0a1c1a23..535d9f2c8e1149b0880e77dd5bd2fb92bd446f0a 100644 (file)
--- a/compat/strlcat.c
+++ b/compat/strlcat.c
@@ -1,7 +1,7 @@
 /*     $OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $     */
 
 /*
- * Copyright (c) 1998, 2003-2005, 2010-2011
+ * Copyright (c) 1998, 2003-2005, 2010-2011, 2013
  *     Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#ifndef HAVE_STRLCAT
+
 #include <sys/types.h>
 #include <string.h>
 
@@ -58,3 +60,4 @@ strlcat(char *dst, const char *src, size_t siz)
 
        return dlen + (s - src);        /* count does not include NUL */
 }
+#endif /* HAVE_STRLCAT */