aboutsummaryrefslogtreecommitdiff
path: root/plugins/popen.c
diff options
context:
space:
mode:
authorGravatar Andreas Baumann <mail@andreasbaumann.cc> 2020-01-09 14:54:12 +0100
committerGravatar Andreas Baumann <mail@andreasbaumann.cc> 2020-01-09 14:54:12 +0100
commitadb958849491ea7e0bba4a15896ebd41a0fbff2d (patch)
tree837f51cfb28406519481a959e5a484f188c0e2cb /plugins/popen.c
parent5e0c236d6a3499f08b16a2ddb5147393e9dbd27a (diff)
parentf53ea7afd8e124690871ebdb79a1432e4dd14488 (diff)
downloadmonitoring-plugins-adb958849491ea7e0bba4a15896ebd41a0fbff2d.tar.gz
Merge branch 'master' into feature_check_curl
Diffstat (limited to 'plugins/popen.c')
-rw-r--r--plugins/popen.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/popen.c b/plugins/popen.c
index 557fb44e..9eb49b62 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -39,9 +39,9 @@
*****************************************************************************/
#include "common.h"
+#include "utils.h"
/* extern so plugin has pid to kill exec'd process on timeouts */
-extern int timeout_interval;
extern pid_t *childpid;
extern int *child_stderr_array;
extern FILE *child_process;
@@ -76,8 +76,6 @@ RETSIGTYPE popen_timeout_alarm_handler (int);
#define SIG_ERR ((Sigfunc *)-1)
#endif
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#define max(a,b) ((a) > (b) ? (a) : (b))
char *pname = NULL; /* caller can set this from argv[0] */