===================================================================
RCS file: /cvs/mandoc/catman.c,v
retrieving revision 1.18
retrieving revision 1.21
diff -u -p -r1.18 -r1.21
--- mandoc/catman.c	2017/02/09 20:53:33	1.18
+++ mandoc/catman.c	2017/02/18 12:24:24	1.21
@@ -1,4 +1,4 @@
-/*	$Id: catman.c,v 1.18 2017/02/09 20:53:33 schwarze Exp $ */
+/*	$Id: catman.c,v 1.21 2017/02/18 12:24:24 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Michael Stapelberg <stapelberg@debian.org>
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -41,16 +41,12 @@
 #include <time.h>
 #include <unistd.h>
 
-#ifndef O_DIRECTORY
-#define O_DIRECTORY 0
-#endif
-
 int	 process_manpage(int, int, const char *);
 int	 process_tree(int, int);
 void	 run_mandocd(int, const char *, const char *)
-		__attribute__((noreturn));
+		__attribute__((__noreturn__));
 ssize_t	 sock_fd_write(int, int, int, int);
-void	 usage(void) __attribute__((noreturn));
+void	 usage(void) __attribute__((__noreturn__));
 
 
 void
@@ -258,7 +254,7 @@ main(int argc, char **argv)
 void
 usage(void)
 {
-	fprintf(stderr, "usage: catman [-I os=name] [-T output] "
-	    "srcdir dstdir\n");
+	fprintf(stderr, "usage: %s [-I os=name] [-T output] "
+	    "srcdir dstdir\n", BINM_CATMAN);
 	exit(1);
 }