===================================================================
RCS file: /cvs/mandoc/compat_getsubopt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mandoc/compat_getsubopt.c	2014/08/17 20:53:50	1.5
+++ mandoc/compat_getsubopt.c	2020/06/15 01:37:15	1.6
@@ -1,14 +1,6 @@
-#include "config.h"
+/*	$Id: compat_getsubopt.c,v 1.6 2020/06/15 01:37:15 schwarze Exp $ */
+/*	$OpenBSD: compat_getsubopt.c,v 1.6 2020/06/15 01:37:15 schwarze Exp $	*/
 
-#if HAVE_GETSUBOPT
-
-int dummy;
-
-#else
-
-/*	$Id: compat_getsubopt.c,v 1.5 2014/08/17 20:53:50 schwarze Exp $	*/
-/*	$OpenBSD: compat_getsubopt.c,v 1.5 2014/08/17 20:53:50 schwarze Exp $	*/
-
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -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 *
 			return(cnt);
 	return(-1);
 }
-
-#endif