commit - 89e0c5dcf3f44e72c2493c634a0a04211242a0eb
commit + a97ec9eb2a1ebb67b1383fd77c670f4d3abf3f9c
blob - 4241d5adf869284cced71791e2faa7645639ba54
blob + f5d1dd604290bd84361ee96d1da7afbf5924bafb
--- client.c
+++ client.c
@@ -94,7 +94,7 @@ static uint32_t		 peerid;
 static int		 handshaked;
 uint32_t		 msize;
 
-static ATTR_DEAD void	client_shutdown(void);
+static __dead void	client_shutdown(void);
 static void		client_sig_handler(int, short, void *);
 static void		client_dispatch_listener(int, short, void *);
 static void		client_privdrop(const char *, const char *);
@@ -169,7 +169,7 @@ static void	tstat(struct np_msg_header *, const uint8_
 static void	tremove(struct np_msg_header *, const uint8_t *, size_t);
 static void	handle_message(struct imsg *, size_t);
 
-ATTR_DEAD void
+__dead void
 client(int debug, int verbose)
 {
 	struct event	ev_sigint, ev_sigterm;
@@ -211,7 +211,7 @@ client(int debug, int verbose)
 	client_shutdown();
 }
 
-static ATTR_DEAD void
+static __dead void
 client_shutdown(void)
 {
 	if (evb != NULL)
blob - 0a10a24169946548cf6ca7e97a13b97c01194d2c
blob + a007ec7f0ca02d97660866c9201bfe28e6af56a4
--- client.h
+++ client.h
@@ -19,6 +19,6 @@
 
 #include "compat.h"
 
-ATTR_DEAD void	client(int, int);
+__dead void	client(int, int);
 
 #endif
blob - f73b73f9e6fce895d04a1b333fb69cad78667c47
blob + 6b13eb697c6f0ea38370106b8bb2c076b685b4ef
--- compat.h
+++ compat.h
@@ -26,7 +26,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#define ATTR_DEAD __attribute__((noreturn))
+#ifndef __dead
+#define __dead __attribute__((noreturn))
+#endif
 
 #if HAVE_EVENT2
 # include <event2/event.h>
blob - 3a6aea1c9deb36a0bfc46be36e40311420f2faa6
blob + 6b3f71d033c44d0f05037b8cebd54c1c3e79580e
--- ftp.c
+++ ftp.c
@@ -86,7 +86,7 @@ read_line(const char *prompt)
 }
 #endif
 
-static void ATTR_DEAD
+static void __dead
 usage(int ret)
 {
 	fprintf(stderr, "usage: %s [-c] host[:port] [path]\n",
blob - 5a8bf12155b9ec01fe04de7b2782454615061ff5
blob + 1a0172f56920d0407171fc51a81795eb6bef5233
--- kamictl.c
+++ kamictl.c
@@ -30,11 +30,11 @@
 #include "kamid.h"
 #include "log.h"
 
-ATTR_DEAD void	 usage(void);
+__dead void	 usage(void);
 
 struct imsgbuf	*ibuf;
 
-ATTR_DEAD void
+__dead void
 usage(void)
 {
 	/*
blob - 46d15918efb465dcd6c93da7c349c76e7ad9c8a7
blob + 05f753529776da3a4945281f04bec846131da94e
--- kamid.c
+++ kamid.c
@@ -53,14 +53,14 @@ const char	*saved_argv0;
 static int	 debug, nflag;
 int		 verbose;
 
-ATTR_DEAD void	usage(void);
+__dead void	usage(void);
 
 void		main_sig_handler(int, short, void *);
 void		main_dispatch_listener(int, short, void *);
 int		main_reload(void);
 int		main_imsg_send_config(struct kd_conf *);
 void		main_dispatch_listener(int, short, void *);
-ATTR_DEAD void	main_shutdown(void);
+__dead void	main_shutdown(void);
 
 static pid_t	start_child(enum kd_process, int, int, int);
 
@@ -70,7 +70,7 @@ const char		*conffile;
 pid_t			 listener_pid;
 uint32_t		 cmd_opts;
 
-ATTR_DEAD void
+__dead void
 usage(void)
 {
 	fprintf(stderr, "usage: %s [-dnv] [-f file] [-s socket]\n",
@@ -542,7 +542,7 @@ config_clear(struct kd_conf *conf)
 	free(conf);
 }
 
-ATTR_DEAD void
+__dead void
 main_shutdown(void)
 {
 	pid_t	pid;
blob - 4283e9c26d28ec654de163b9a52877a17ec90c40
blob + 6c7171faab707741aba6595e903666e9a77964eb
--- kamirepl.c
+++ kamirepl.c
@@ -56,7 +56,7 @@ struct tls_config	*tlsconf;
 struct tls		*ctx;
 struct bufferevent	*bev, *inbev;
 
-static void ATTR_DEAD	 usage(int);
+static void __dead	 usage(int);
 
 static void		 sig_handler(int, short, void *);
 
@@ -91,7 +91,7 @@ static void		 handle_9p(const uint8_t *, size_t);
 static void		 clr(void);
 static void		 prompt(void);
 
-static void ATTR_DEAD
+static void __dead
 usage(int ret)
 {
 	fprintf(stderr,
blob - ffdd66bbee373a67b11b47ee33ab70dd707d98db
blob + 196a2a9f84052ad4fef72faea5dc79a91530ccb7
--- listener.c
+++ listener.c
@@ -44,7 +44,7 @@ static struct kd_conf	*listener_conf;
 static struct imsgev	*iev_main;
 
 static void	listener_sig_handler(int, short, void *);
-ATTR_DEAD void	listener_shutdown(void);
+__dead void	listener_shutdown(void);
 
 SPLAY_HEAD(clients_tree_id, client) clients;
 
@@ -166,7 +166,7 @@ listener(int debug, int verbose)
 	listener_shutdown();
 }
 
-ATTR_DEAD void
+__dead void
 listener_shutdown(void)
 {
 	msgbuf_clear(&iev_main->ibuf.w);
blob - 0a03c597790b71166630fed098b600408a042624
blob + 06d92fcce2b042403dc0d18cc578cf59e8fbc9d8
--- log.h
+++ log.h
@@ -35,9 +35,9 @@ void	logit(int, const char *, ...)
 	    __attribute__((__format__ (printf, 2, 3)));
 void	vlog(int, const char *, va_list)
 	    __attribute__((__format__ (printf, 2, 0)));
-ATTR_DEAD void fatal(const char *, ...)
+__dead void fatal(const char *, ...)
 	    __attribute__((__format__ (printf, 1, 2)));
-ATTR_DEAD void fatalx(const char *, ...)
+__dead void fatalx(const char *, ...)
 	    __attribute__((__format__ (printf, 1, 2)));
 
 #endif /* LOG_H */