mdocml: Be consistent in protecting __attribute__ attributes with __;

mdocml: Be consistent in protecting __attribute__ attributes with __;

[schwarze]

Log Message:
-----------
Be consistent in protecting __attribute__ attributes with __;
from Christos Zoulas <christos @ NetBSD>.

Modified Files:
--------------
    mdocml:
        catman.c
        libmandoc.h
        main.c
        mandoc_aux.h
        mandocd.c
        mandocdb.c
        tag.c
        term_ps.c

Revision Data
-------------
Index: tag.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/tag.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -Ltag.c -Ltag.c -u -p -r1.17 -r1.18
--- tag.c
+++ 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;
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -Lmain.c -Lmain.c -u -p -r1.282 -r1.283
--- main.c
+++ main.c
@@ -100,7 +100,7 @@ static	void		  parse(struct curparse *, 
 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};
Index: catman.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/catman.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lcatman.c -Lcatman.c -u -p -r1.19 -r1.20
--- catman.c
+++ 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
Index: mandoc_aux.h
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandoc_aux.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lmandoc_aux.h -Lmandoc_aux.h -u -p -r1.5 -r1.6
--- mandoc_aux.h
+++ 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);
Index: term_ps.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/term_ps.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -Lterm_ps.c -Lterm_ps.c -u -p -r1.82 -r1.83
--- term_ps.c
+++ 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);
Index: mandocd.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lmandocd.c -Lmandocd.c -u -p -r1.4 -r1.5
--- mandocd.c
+++ 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
Index: libmandoc.h
===================================================================
RCS file: /home/cvs/mdocml/mdocml/libmandoc.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -Llibmandoc.h -Llibmandoc.h -u -p -r1.64 -r1.65
--- libmandoc.h
+++ libmandoc.h
@@ -43,7 +43,7 @@ void		 mandoc_msg(enum mandocerr, struct
 			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);
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.242 -r1.243
--- mandocdb.c
+++ mandocdb.c
@@ -162,7 +162,7 @@ static	void	 putmdockey(const struct mpa
 			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]);
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv