diff options
author | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2023-09-27 09:55:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-27 09:55:51 +0200 |
commit | 96f69f7829dc56b7d1e74b27da2a1826d49346c1 (patch) | |
tree | 644b0c1c57cb0aab049385789354017da05b17bd | |
parent | 719e27ddc2f0b48bcd7fe5584b23e3ce83ddf291 (diff) | |
parent | 513929d796af668e977ca7981800c259304a2f25 (diff) | |
download | monitoring-plugins-96f69f7829dc56b7d1e74b27da2a1826d49346c1.tar.gz |
Merge pull request #1926 from RincewindsHat/remove_retsigtype
Remove check for RETSIGTYPE in autoconf stuff
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | lib/utils_cmd.h | 2 | ||||
-rw-r--r-- | plugins/netutils.h | 2 | ||||
-rw-r--r-- | plugins/popen.c | 8 | ||||
-rw-r--r-- | plugins/popen.h | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index a294b00f..e6a40d3f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -621,7 +621,6 @@ AC_C_CONST | |||
621 | AC_STRUCT_TM | 621 | AC_STRUCT_TM |
622 | AC_TYPE_PID_T | 622 | AC_TYPE_PID_T |
623 | AC_TYPE_SIZE_T | 623 | AC_TYPE_SIZE_T |
624 | AC_TYPE_SIGNAL | ||
625 | 624 | ||
626 | AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[ | 625 | AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[ |
627 | AC_TRY_LINK([#include <stdarg.h> | 626 | AC_TRY_LINK([#include <stdarg.h> |
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h index 1fc2968c..f1b06c82 100644 --- a/lib/utils_cmd.h +++ b/lib/utils_cmd.h | |||
@@ -33,7 +33,7 @@ void cmd_init (void); | |||
33 | #define CMD_NO_ASSOC 0x02 /* output.line won't point to buf */ | 33 | #define CMD_NO_ASSOC 0x02 /* output.line won't point to buf */ |
34 | 34 | ||
35 | 35 | ||
36 | RETSIGTYPE timeout_alarm_handler (int); | 36 | void timeout_alarm_handler (int); |
37 | 37 | ||
38 | 38 | ||
39 | #endif /* _UTILS_CMD_ */ | 39 | #endif /* _UTILS_CMD_ */ |
diff --git a/plugins/netutils.h b/plugins/netutils.h index d7ee0ddd..ea653e72 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h | |||
@@ -92,7 +92,7 @@ extern int econn_refuse_state; | |||
92 | extern int was_refused; | 92 | extern int was_refused; |
93 | extern int address_family; | 93 | extern int address_family; |
94 | 94 | ||
95 | RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn)); | 95 | void socket_timeout_alarm_handler (int) __attribute__((noreturn)); |
96 | 96 | ||
97 | /* SSL-Related functionality */ | 97 | /* SSL-Related functionality */ |
98 | #ifdef HAVE_SSL | 98 | #ifdef HAVE_SSL |
diff --git a/plugins/popen.c b/plugins/popen.c index b395f14a..036bc608 100644 --- a/plugins/popen.c +++ b/plugins/popen.c | |||
@@ -50,9 +50,9 @@ extern FILE *child_process; | |||
50 | FILE *spopen (const char *); | 50 | FILE *spopen (const char *); |
51 | int spclose (FILE *); | 51 | int spclose (FILE *); |
52 | #ifdef REDHAT_SPOPEN_ERROR | 52 | #ifdef REDHAT_SPOPEN_ERROR |
53 | RETSIGTYPE popen_sigchld_handler (int); | 53 | void popen_sigchld_handler (int); |
54 | #endif | 54 | #endif |
55 | RETSIGTYPE popen_timeout_alarm_handler (int); | 55 | void popen_timeout_alarm_handler (int); |
56 | 56 | ||
57 | #include <stdarg.h> /* ANSI C header file */ | 57 | #include <stdarg.h> /* ANSI C header file */ |
58 | #include <fcntl.h> | 58 | #include <fcntl.h> |
@@ -266,7 +266,7 @@ spclose (FILE * fp) | |||
266 | } | 266 | } |
267 | 267 | ||
268 | #ifdef REDHAT_SPOPEN_ERROR | 268 | #ifdef REDHAT_SPOPEN_ERROR |
269 | RETSIGTYPE | 269 | void |
270 | popen_sigchld_handler (int signo) | 270 | popen_sigchld_handler (int signo) |
271 | { | 271 | { |
272 | if (signo == SIGCHLD) | 272 | if (signo == SIGCHLD) |
@@ -274,7 +274,7 @@ popen_sigchld_handler (int signo) | |||
274 | } | 274 | } |
275 | #endif | 275 | #endif |
276 | 276 | ||
277 | RETSIGTYPE | 277 | void |
278 | popen_timeout_alarm_handler (int signo) | 278 | popen_timeout_alarm_handler (int signo) |
279 | { | 279 | { |
280 | int fh; | 280 | int fh; |
diff --git a/plugins/popen.h b/plugins/popen.h index a5dd8fa7..1ea69632 100644 --- a/plugins/popen.h +++ b/plugins/popen.h | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | FILE *spopen (const char *); | 6 | FILE *spopen (const char *); |
7 | int spclose (FILE *); | 7 | int spclose (FILE *); |
8 | RETSIGTYPE popen_timeout_alarm_handler (int); | 8 | void popen_timeout_alarm_handler (int); |
9 | 9 | ||
10 | pid_t *childpid=NULL; | 10 | pid_t *childpid=NULL; |
11 | int *child_stderr_array=NULL; | 11 | int *child_stderr_array=NULL; |