===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.270
retrieving revision 1.273
diff -u -p -r1.270 -r1.273
--- mandoc/main.c	2016/07/15 18:03:45	1.270
+++ mandoc/main.c	2016/07/19 13:36:13	1.273
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.270 2016/07/15 18:03:45 schwarze Exp $ */
+/*	$Id: main.c,v 1.273 2016/07/19 13:36:13 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2016 Ingo Schwarze <schwarze@openbsd.org>
@@ -51,12 +51,6 @@
 #include "manconf.h"
 #include "mansearch.h"
 
-#if !defined(__GNUC__) || (__GNUC__ < 2)
-# if !defined(lint)
-#  define __attribute__(x)
-# endif
-#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
-
 enum	outmode {
 	OUTMODE_DEF = 0,
 	OUTMODE_FLN,
@@ -88,7 +82,9 @@ struct	curparse {
 };
 
 
+#if HAVE_SQLITE3
 int			  mandocdb(int, char *[]);
+#endif
 
 static	int		  fs_lookup(const struct manpaths *,
 				size_t ipath, const char *,
@@ -98,9 +94,6 @@ static	void		  fs_search(const struct mansearch *,
 				const struct manpaths *, int, char**,
 				struct manpage **, size_t *);
 static	int		  koptions(int *, char *);
-#if HAVE_SQLITE3
-int			  mandocdb(int, char**);
-#endif
 static	int		  moptions(int *, char *);
 static	void		  mmsg(enum mandocerr, enum mandoclevel,
 				const char *, int, int, const char *);
@@ -981,7 +974,7 @@ woptions(struct curparse *curp, char *arg)
 
 	while (*arg) {
 		o = arg;
-		switch (getsubopt(&arg, UNCONST(toks), &v)) {
+		switch (getsubopt(&arg, (char * const *)toks, &v)) {
 		case 0:
 			curp->wstop = 1;
 			break;