summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catman.c4
-rw-r--r--libmandoc.h2
-rw-r--r--main.c2
-rw-r--r--mandoc_aux.h2
-rw-r--r--mandocd.c2
-rw-r--r--mandocdb.c2
-rw-r--r--tag.c2
-rw-r--r--term_ps.c2
8 files changed, 9 insertions, 9 deletions
diff --git a/catman.c b/catman.c
index 01c5e2bf..8a3aed3a 100644
--- a/catman.c
+++ b/catman.c
@@ -48,9 +48,9 @@
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
diff --git a/libmandoc.h b/libmandoc.h
index 2003ec63..1a423b04 100644
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -43,7 +43,7 @@ void mandoc_msg(enum mandocerr, struct mparse *,
int, int, const char *);
void mandoc_vmsg(enum mandocerr, struct mparse *,
int, int, const char *, ...)
- __attribute__((__format__ (printf, 5, 6)));
+ __attribute__((__format__ (__printf__, 5, 6)));
char *mandoc_getarg(struct mparse *, char **, int, int *);
char *mandoc_normdate(struct mparse *, char *, int, int);
int mandoc_eos(const char *, size_t);
diff --git a/main.c b/main.c
index 5a665280..30750cd7 100644
--- a/main.c
+++ b/main.c
@@ -100,7 +100,7 @@ static void parse(struct curparse *, int, const char *);
static void passthrough(const char *, int, int);
static pid_t spawn_pager(struct tag_files *);
static int toptions(struct curparse *, char *);
-static void usage(enum argmode) __attribute__((noreturn));
+static void usage(enum argmode) __attribute__((__noreturn__));
static int woptions(struct curparse *, char *);
static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
diff --git a/mandoc_aux.h b/mandoc_aux.h
index b6a70ae9..3742c412 100644
--- a/mandoc_aux.h
+++ b/mandoc_aux.h
@@ -17,7 +17,7 @@
*/
int mandoc_asprintf(char **, const char *, ...)
- __attribute__((__format__ (printf, 2, 3)));
+ __attribute__((__format__ (__printf__, 2, 3)));
void *mandoc_calloc(size_t, size_t);
void *mandoc_malloc(size_t);
void *mandoc_realloc(void *, size_t);
diff --git a/mandocd.c b/mandocd.c
index 342b1139..b4fb484d 100644
--- a/mandocd.c
+++ b/mandocd.c
@@ -49,7 +49,7 @@ enum outt {
static void process(struct mparse *, enum outt, void *);
static int read_fds(int, int *);
-static void usage(void) __attribute__((noreturn));
+static void usage(void) __attribute__((__noreturn__));
#define NUM_FDS 3
diff --git a/mandocdb.c b/mandocdb.c
index 1b384d94..7e790738 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -162,7 +162,7 @@ static void putmdockey(const struct mpage *,
const struct roff_node *, uint64_t, int);
static int render_string(char **, size_t *);
static void say(const char *, const char *, ...)
- __attribute__((__format__ (printf, 2, 3)));
+ __attribute__((__format__ (__printf__, 2, 3)));
static int set_basedir(const char *, int);
static int treescan(void);
static size_t utf8(unsigned int, char [7]);
diff --git a/tag.c b/tag.c
index 381791be..b57df552 100644
--- a/tag.c
+++ b/tag.c
@@ -38,7 +38,7 @@ struct tag_entry {
char s[];
};
-static void tag_signal(int) __attribute__((noreturn));
+static void tag_signal(int) __attribute__((__noreturn__));
static struct ohash tag_data;
static struct tag_files tag_files;
diff --git a/term_ps.c b/term_ps.c
index a348f806..4f5fef61 100644
--- a/term_ps.c
+++ b/term_ps.c
@@ -104,7 +104,7 @@ static void ps_pclose(struct termp *);
static void ps_plast(struct termp *);
static void ps_pletter(struct termp *, int);
static void ps_printf(struct termp *, const char *, ...)
- __attribute__((__format__ (printf, 2, 3)));
+ __attribute__((__format__ (__printf__, 2, 3)));
static void ps_putchar(struct termp *, char);
static void ps_setfont(struct termp *, enum termfont);
static void ps_setwidth(struct termp *, int, int);