===================================================================
RCS file: /cvs/mandoc/compat_getsubopt.c,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -p -r1.2 -r1.5
--- mandoc/compat_getsubopt.c	2011/12/18 14:27:01	1.2
+++ mandoc/compat_getsubopt.c	2014/08/17 20:53:50	1.5
@@ -1,14 +1,13 @@
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_GETSUBOPT
+#if HAVE_GETSUBOPT
 
 int dummy;
 
 #else
 
-/*	$OpenBSD: compat_getsubopt.c,v 1.2 2011/12/18 14:27:01 kristaps Exp $	*/
+/*	$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
@@ -43,18 +42,11 @@ int dummy;
 #include <stdlib.h>
 #include <string.h>
 
-/*
- * The SVID interface to getsubopt provides no way of figuring out which
- * part of the suboptions list wasn't matched.  This makes error messages
- * tricky...  The extern variable suboptarg is a pointer to the token
- * which didn't match.
- */
-char *suboptarg;
-
 int
 getsubopt(char **optionp, char * const *tokens, char **valuep)
 {
 	int cnt;
+	char *suboptarg;
 	char *p;
 
 	suboptarg = *valuep = NULL;