summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2017-03-17 23:33:01 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2017-03-18 17:38:17 +0100
commitcd5863bb2c356846fce05056a75d67d0948a9c42 (patch)
treea77aa7eabc454823e5cf33f5bcc3245b09de9700
parent1a6044a7e7983101c9e7fe2b3fffa7dd82b2789a (diff)
downloadgnutls-cd5863bb2c356846fce05056a75d67d0948a9c42.tar.gz
Avoid deprecation warnings when including gnutls/abstract.h
Since ac3de8f5, when all openpgp functionality was deprecated, a library user including gnutls/abstract.h gets warnings about deprecated declarations, like this: gnutls/openpgp.h:328:10: warning: ‘gnutls_openpgp_recv_key_func’ is deprecated [-Wdeprecated-declarations] gnutls_openpgp_recv_key_func func) _GNUTLS_GCC_ATTR_DEPRECATED; This warning is emitted since the gnutls_openpgp_set_recv_key_function prototype uses the deprecated typedef gnutls_openpgp_recv_key_func. By omitting the deprecation attribute from this individual typedef, we avoid the spurious warnings in calling code which just includes gnutls/abstract.h without actually using anything related to openpgp. Signed-off-by: Martin Storsjo <martin@martin.st>
-rw-r--r--lib/includes/gnutls/openpgp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 69a6e19e68..69176c7814 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -320,7 +320,7 @@ typedef int (*gnutls_openpgp_recv_key_func) (gnutls_session_t
*keyfpr,
unsigned int
keyfpr_length,
- gnutls_datum_t * key) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_datum_t * key);
void
gnutls_openpgp_set_recv_key_function(gnutls_session_t session,