From be382c572561862fee3a7bf3dae1b0236ac3216b Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Mon, 15 Jun 2020 01:37:14 +0000
Subject: Only compile compat_*.c implementations that are actually needed.
 That's cleaner and it is supposed to fix compiler warnings with gcc 10
 reported by Wynn Wolf Arbor <wolf at oriole dot systems> on discuss@.

---
 compat_strlcat.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'compat_strlcat.c')

diff --git a/compat_strlcat.c b/compat_strlcat.c
index acaae4fb..a5fa75fd 100644
--- a/compat_strlcat.c
+++ b/compat_strlcat.c
@@ -1,11 +1,4 @@
-#include "config.h"
-
-#if HAVE_STRLCAT
-
-int dummy;
-
-#else
-
+/*	$Id: compat_strlcat.c,v 1.5 2020/06/15 01:37:15 schwarze Exp $	*/
 /*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
 
 /*
@@ -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>
@@ -61,5 +55,3 @@ strlcat(char *dst, const char *src, size_t siz)
 
 	return(dlen + (s - src));	/* count does not include NUL */
 }
-
-#endif
-- 
cgit v1.2.3