merge strcpy_truncate branch

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5027 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/roken/strcpy_truncate.c

@@ -43,6 +43,8 @@
 
 RCSID("$Id$");
 
+#ifndef HAVE_STRCPY_TRUNCATE
+
 int
 strcpy_truncate (char *dst, const char *src, size_t dst_sz)
 {
@@ -59,3 +61,5 @@ strcpy_truncate (char *dst, const char *src, size_t dst_sz)
     else
 	return dst_sz;
 }
+
+#endif