From d382242fb6789973ce8d246ec154a4a1468c24c0 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sun, 26 Jul 2015 12:50:16 +0200 Subject: Replace GNUPG_GCC_A_ macros by GPGRT_ATTR_ macros. * common/util.h: Provide replacement for GPGRT_ATTR_ macros when using libgpg-error < 1.20. * common/mischelp.h: Ditto. * common/types.h: Ditto. -- Given that libgpg-error is a dependency of all GnuPG related libraries it is better to define such macros at only one place instead of having similar macros at a lot of places. For now we need repalcement macros, though. --- agent/agent.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'agent') diff --git a/agent/agent.h b/agent/agent.h index 5a0925496..164ddea91 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -319,7 +319,8 @@ typedef int (*lookup_ttl_t)(const char *hexgrip); /*-- gpg-agent.c --*/ -void agent_exit (int rc) GPGRT_GCC_A_NR; /* Also implemented in other tools */ +void agent_exit (int rc) + GPGRT_ATTR_NORETURN; /* Also implemented in other tools */ gpg_error_t agent_copy_startup_env (ctrl_t ctrl); const char *get_agent_socket_name (void); const char *get_agent_ssh_socket_name (void); @@ -332,10 +333,10 @@ int map_pk_openpgp_to_gcry (int openpgp_algo); /*-- command.c --*/ gpg_error_t agent_inq_pinentry_launched (ctrl_t ctrl, unsigned long pid); gpg_error_t agent_write_status (ctrl_t ctrl, const char *keyword, ...) - GNUPG_GCC_A_SENTINEL(0); + GPGRT_ATTR_SENTINEL(0); gpg_error_t agent_print_status (ctrl_t ctrl, const char *keyword, const char *format, ...) - GPGRT_GCC_A_PRINTF(3,4); + GPGRT_ATTR_PRINTF(3,4); void bump_key_eventcounter (void); void bump_card_eventcounter (void); void start_command_handler (ctrl_t, gnupg_fd_t, gnupg_fd_t); -- cgit v1.2.3