From d66fb3aa53a6c4a815fe35a15e3c61886c5df628 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 18 Nov 2020 13:51:38 +0900 Subject: build: Update to newer autoconf constructs. * acinclude.m4 (GNUPG_CHECK_ENDIAN): Use AC_COMPILE_IFELSE instead of AC_TRY_COMPILE. Use AC_RUN_IFELSE instead of AC_TRY_RUN. (GNUPG_BUILD_PROGRAM): Use AS_HELP_STRING instead of AC_HELP_STRING. * configure.ac: Use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE. Use AS_HELP_STRING instead of AC_HELP_STRING. (AC_ISC_POSIX): Replace by AC_SEARCH_LIBS. (AC_TYPE_SIGNAL): Remove. * m4/isc-posix.m4: Remove. * m4/codeset.m4: Update from gnulib. * m4/gettext.m4: Update from gnulib. * m4/lcmessage.m4: Update from gnulib. * m4/socklen.m4: Update from gnulib. * m4/ldap.m4: Use AS_HELP_STRING instead of AC_HELP_STRING. Use AC_LINK_IFELSE instead of AC_TRY_LINK. Use AC_RUN_IFELSE instead of AC_TRY_RUN. * m4/gpg-error.m4: Update from libgpg-error. * m4/readline.m4: Update from libgpg-error. * m4/npth.m4: Update from npth. * m4/libassuan.m4: Update from libassuan. * m4/libgcrypt.m4: Update from libgcrypt. * m4/ksba.m4: Update from libksba. * m4/ntbtls.m4: Update from ntbtls. * common/signal.c [!HAVE_DOSISH_SYSTEM] (init_one_signal): Replace RETSIGTYPE to void. [!HAVE_DOSISH_SYSTEM] (got_fatal_signal, got_usr_signal): Likewise. Signed-off-by: NIIBE Yutaka --- common/signal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'common/signal.c') diff --git a/common/signal.c b/common/signal.c index ccfa8e670..41c14ba68 100644 --- a/common/signal.c +++ b/common/signal.c @@ -51,7 +51,7 @@ static void (*cleanup_fnc)(void); #ifndef HAVE_DOSISH_SYSTEM static void -init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign ) +init_one_signal (int sig, void (*handler)(int), int check_ign ) { # ifdef HAVE_SIGACTION struct sigaction oact, nact; @@ -69,7 +69,7 @@ init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign ) nact.sa_flags = 0; sigaction ( sig, &nact, NULL); # else - RETSIGTYPE (*ohandler)(int); + void (*ohandler)(int); ohandler = signal (sig, handler); if (check_ign && ohandler == SIG_IGN) @@ -96,7 +96,7 @@ get_signal_name( int signum ) #endif /*!HAVE_DOSISH_SYSTEM*/ #ifndef HAVE_DOSISH_SYSTEM -static RETSIGTYPE +static void got_fatal_signal (int sig) { const char *s; @@ -155,7 +155,7 @@ got_fatal_signal (int sig) #endif /*!HAVE_DOSISH_SYSTEM*/ #ifndef HAVE_DOSISH_SYSTEM -static RETSIGTYPE +static void got_usr_signal (int sig) { (void)sig; -- cgit v1.2.3