===================================================================
RCS file: /cvs/mandoc/compat_strlcpy.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mandoc/compat_strlcpy.c	2014/08/16 19:00:01	1.4
+++ mandoc/compat_strlcpy.c	2020/06/15 01:37:15	1.5
@@ -1,13 +1,6 @@
-#include "config.h"
+/*	$Id: compat_strlcpy.c,v 1.5 2020/06/15 01:37:15 schwarze Exp $	*/
+/*	$OpenBSD: compat_strlcpy.c,v 1.5 2020/06/15 01:37:15 schwarze Exp $	*/
 
-#if HAVE_STRLCPY
-
-int dummy;
-
-#else
-
-/*	$OpenBSD: compat_strlcpy.c,v 1.4 2014/08/16 19:00:01 schwarze Exp $	*/
-
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
  *
@@ -23,6 +16,7 @@ int dummy;
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
 
 #include <sys/types.h>
 #include <string.h>
@@ -57,5 +51,3 @@ strlcpy(char *dst, const char *src, size_t siz)
 
 	return(s - src - 1);	/* count does not include NUL */
 }
-
-#endif