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_strtonum.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'compat_strtonum.c')

diff --git a/compat_strtonum.c b/compat_strtonum.c
index 628e5d51..ce0459fa 100644
--- a/compat_strtonum.c
+++ b/compat_strtonum.c
@@ -1,13 +1,5 @@
-#include "config.h"
-
-#if HAVE_STRTONUM
-
-int dummy;
-
-#else
-
-/*	$Id: compat_strtonum.c,v 1.1 2015/02/16 14:56:22 schwarze Exp $	*/
-/*	$OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $	*/
+/*	$Id: compat_strtonum.c,v 1.2 2020/06/15 01:37:15 schwarze Exp $	*/
+/*	$OpenBSD: strtonum.c,v 1.8 2015/09/13 08:31:48 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004 Ted Unangst and Todd Miller
@@ -25,6 +17,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 <errno.h>
 #include <limits.h>
@@ -72,5 +65,3 @@ strtonum(const char *numstr, long long minval, long long maxval,
 
 	return (ll);
 }
-
-#endif /* !HAVE_STRTONUM */
-- 
cgit v1.2.3-56-ge451