From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Fri, 18 Oct 2019 10:22:06 +0000 (+0300)
Subject: src: fix noreturn-related warning
X-Git-Tag: gnutls_3_6_11~29^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e1f87900269fcdfd7bd34fcb1d6240b0ea389ec9;p=thirdparty%2Fgnutls.git

src: fix noreturn-related warning

Recent autogen started adding '#include <stdnoreturn.h>' into -args.h
files. However in GnuTLS tools code this results in the following
warnings, because stdnoreturn.h unconditionally redefines 'noreturn' to
_Noreturn:

warning: '_Noreturn' attribute directive ignored

Use __noreturn__ attribute instead as does Gnulib.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---

diff --git a/src/certtool-common.h b/src/certtool-common.h
index a4b4c5867f..7217e69dec 100644
--- a/src/certtool-common.h
+++ b/src/certtool-common.h
@@ -113,7 +113,7 @@ const char *get_pass(void);
 const char *get_confirmed_pass(bool empty_ok);
 void app_exit(int val)
 #ifdef __GNUC__
-__attribute__ ((noreturn))
+__attribute__ ((__noreturn__))
 #endif
 ;
 int cipher_to_flags(const char *cipher);
diff --git a/src/serv.c b/src/serv.c
index 60b02f6983..64ee8f4e01 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -1070,7 +1070,7 @@ get_response(gnutls_session_t session, char *request,
 	*response_length = ((*response) ? strlen(*response) : 0);
 }
 
-static void terminate(int sig) __attribute__ ((noreturn));
+static void terminate(int sig) __attribute__ ((__noreturn__));
 
 static void terminate(int sig)
 {