From d5e29991c0c700d606d4ee4158cfd248bc1d3fd9 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 16 Sep 2022 14:33:50 +0900 Subject: [PATCH] dirmngr:dns,doc,gpg: Fix for noreturn for C11. * dirmngr/dns.c: Use __noreturn__. * doc/yat2m.c: Likewise. * g10/main.h: Likewise. -- GnuPG-bug-id: 4002 Signed-off-by: NIIBE Yutaka --- dirmngr/dns.c | 2 +- doc/yat2m.c | 2 +- g10/main.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dirmngr/dns.c b/dirmngr/dns.c index 3741730e0..e0eb33244 100644 --- a/dirmngr/dns.c +++ b/dirmngr/dns.c @@ -130,7 +130,7 @@ typedef int socket_fd_t; #if __GNUC__ #define DNS_NOTUSED __attribute__((unused)) -#define DNS_NORETURN __attribute__((noreturn)) +#define DNS_NORETURN __attribute__((__noreturn__)) #else #define DNS_NOTUSED #define DNS_NORETURN diff --git a/doc/yat2m.c b/doc/yat2m.c index 2d6f54ea2..9ba950dcf 100644 --- a/doc/yat2m.c +++ b/doc/yat2m.c @@ -120,7 +120,7 @@ #if MY_GCC_VERSION >= 20500 # define ATTR_PRINTF(f, a) __attribute__ ((format(printf,f,a))) -# define ATTR_NR_PRINTF(f, a) __attribute__ ((noreturn, format(printf,f,a))) +# define ATTR_NR_PRINTF(f, a) __attribute__ ((__noreturn__, format(printf,f,a))) #else # define ATTR_PRINTF(f, a) # define ATTR_NR_PRINTF(f, a) diff --git a/g10/main.h b/g10/main.h index 0525732f2..74c29cc92 100644 --- a/g10/main.h +++ b/g10/main.h @@ -87,7 +87,7 @@ struct weakhash extern int g10_errors_seen; #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ) - void g10_exit(int rc) __attribute__ ((noreturn)); + void g10_exit(int rc) __attribute__ ((__noreturn__)); #else void g10_exit(int rc); #endif