X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/8ba55f016df3035abde0f0e18009fd202d208c7d..c0fb3f2307fc80d2d85cc1ab16c3fd262bba49a6:/compat_getsubopt.c

diff --git a/compat_getsubopt.c b/compat_getsubopt.c
index 9cd41536..880f2f78 100644
--- a/compat_getsubopt.c
+++ b/compat_getsubopt.c
@@ -1,13 +1,12 @@
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_GETSUBOPT
+#if HAVE_GETSUBOPT
 
 int dummy;
 
 #else
 
+/*	$Id: compat_getsubopt.c,v 1.5 2014/08/17 20:53:50 schwarze Exp $	*/
 /*	$OpenBSD: getsubopt.c,v 1.4 2005/08/08 08:05:36 espie Exp $	*/
 
 /*-
@@ -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;