From 5a2022bad6ea3a79a27a1ff0f18e1e9b02932d4d 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_ohash.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'compat_ohash.c')

diff --git a/compat_ohash.c b/compat_ohash.c
index cbd60521..f6c72cd6 100644
--- a/compat_ohash.c
+++ b/compat_ohash.c
@@ -1,11 +1,4 @@
-#include "config.h"
-
-#if HAVE_OHASH
-
-int dummy;
-
-#else
-
+/* $Id$ */
 /* $OpenBSD: ohash.c,v 1.1 2014/06/02 18:52:03 deraadt Exp $ */
 
 /* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
@@ -22,9 +15,9 @@ 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 <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -335,5 +328,3 @@ ohash_qlookupi(struct ohash *h, const char *s, const char **e)
 	hv = ohash_interval(s, e);
 	return ohash_lookup_interval(h, s, *e, hv);
 }
-
-#endif /*!HAVE_OHASH*/
-- 
cgit