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

(limited to 'compat_getsubopt.c')

diff --git a/compat_getsubopt.c b/compat_getsubopt.c
index 880f2f78..c442f87e 100644
--- a/compat_getsubopt.c
+++ b/compat_getsubopt.c
@@ -1,12 +1,4 @@
-#include "config.h"
-
-#if HAVE_GETSUBOPT
-
-int dummy;
-
-#else
-
-/*	$Id: compat_getsubopt.c,v 1.5 2014/08/17 20:53:50 schwarze Exp $	*/
+/*	$Id: compat_getsubopt.c,v 1.6 2020/06/15 01:37:15 schwarze Exp $ */
 /*	$OpenBSD: getsubopt.c,v 1.4 2005/08/08 08:05:36 espie Exp $	*/
 
 /*-
@@ -37,6 +29,7 @@ int dummy;
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#include "config.h"
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -92,5 +85,3 @@ getsubopt(char **optionp, char * const *tokens, char **valuep)
 			return(cnt);
 	return(-1);
 }
-
-#endif
-- 
cgit v1.2.3