===================================================================
RCS file: /cvs/mandoc/mansearch.h,v
retrieving revision 1.20
retrieving revision 1.24
diff -u -p -r1.20 -r1.24
--- mandoc/mansearch.h	2014/11/18 01:15:21	1.20
+++ mandoc/mansearch.h	2015/11/07 14:01:16	1.24
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.h,v 1.20 2014/11/18 01:15:21 schwarze Exp $ */
+/*	$Id: mansearch.h,v 1.24 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,8 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef MANSEARCH_H
-#define MANSEARCH_H
 
 #define	MANDOC_DB	 "mandoc.db"
 
@@ -70,7 +68,6 @@
 
 #define	FORM_CAT	 0  /* manual page is preformatted */
 #define	FORM_SRC	 1  /* format is mdoc(7) or man(7) */
-#define	FORM_GZ		 2  /* compressed with gzip(1) */
 #define	FORM_NONE	 4  /* format is unknown */
 
 enum	argmode {
@@ -98,8 +95,9 @@ struct	mansearch {
 	int		 firstmatch; /* first matching database only */
 };
 
-__BEGIN_DECLS
 
+struct	manpaths;
+
 int	mansearch_setup(int);
 int	mansearch(const struct mansearch *cfg, /* options */
 		const struct manpaths *paths, /* manpaths */
@@ -108,7 +106,3 @@ int	mansearch(const struct mansearch *cfg, /* options 
 		struct manpage **res, /* results */
 		size_t *ressz); /* results returned */
 void	mansearch_free(struct manpage *, size_t);
-
-__END_DECLS
-
-#endif /* MANSEARCH_H */