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

(limited to 'compat_reallocarray.c')

diff --git a/compat_reallocarray.c b/compat_reallocarray.c
index 66151904..a12cec13 100644
--- a/compat_reallocarray.c
+++ b/compat_reallocarray.c
@@ -1,13 +1,5 @@
-#include "config.h"
-
-#if HAVE_REALLOCARRAY
-
-int dummy;
-
-#else
-
-/*	$Id: compat_reallocarray.c,v 1.4 2014/12/11 09:05:01 schwarze Exp $	*/
-/*	$OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $	*/
+/*	$Id: compat_reallocarray.c,v 1.5 2020/06/15 01:37:15 schwarze Exp $ */
+/*	$OpenBSD: reallocarray.c,v 1.3 2015/09/13 08:31:47 guenther Exp $	*/
 /*
  * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
  *
@@ -23,6 +15,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 <errno.h>
@@ -45,5 +38,3 @@ reallocarray(void *optr, size_t nmemb, size_t size)
 	}
 	return realloc(optr, size * nmemb);
 }
-
-#endif /*!HAVE_REALLOCARRAY*/
-- 
cgit v1.2.3-56-ge451