===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.38
retrieving revision 1.41
diff -u -p -r1.38 -r1.41
--- mandoc/Attic/apropos.c	2014/04/11 15:46:52	1.38
+++ mandoc/Attic/apropos.c	2014/08/16 23:04:25	1.41
@@ -1,4 +1,4 @@
-/*	$Id: apropos.c,v 1.38 2014/04/11 15:46:52 schwarze Exp $ */
+/*	$Id: apropos.c,v 1.41 2014/08/16 23:04:25 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,10 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
 #include <sys/param.h>
+#include <sys/types.h>
 
 #include <assert.h>
 #include <getopt.h>
@@ -31,8 +31,9 @@
 #include "manpath.h"
 #include "mansearch.h"
 
+
 int
-main(int argc, char *argv[])
+apropos(int argc, char *argv[])
 {
 	int		 ch, whatis;
 	struct mansearch search;
@@ -63,22 +64,22 @@ main(int argc, char *argv[])
 
 	while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))
 		switch (ch) {
-		case ('C'):
+		case 'C':
 			conf_file = optarg;
 			break;
-		case ('M'):
+		case 'M':
 			defpaths = optarg;
 			break;
-		case ('m'):
+		case 'm':
 			auxpaths = optarg;
 			break;
-		case ('O'):
+		case 'O':
 			outkey = optarg;
 			break;
-		case ('S'):
+		case 'S':
 			search.arch = optarg;
 			break;
-		case ('s'):
+		case 's':
 			search.sec = optarg;
 			break;
 		default: