Merge branch 'master' into feature/new_output_infra

2 files changed, 3 insertions, 9 deletions

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 97c0e39a..baff682a 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1805,7 +1805,7 @@ print_help (void)
   printf (" %s\n", "--invert-regex");
   printf ("    %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)"));
   printf ("    %s\n", _("can be changed with --state--regex)"));
-  printf (" %s\n", "--regex-state=STATE");
+  printf (" %s\n", "--state-regex=STATE");
   printf ("    %s\n", _("Return STATE if regex is found, OK if not\n"));
 
   printf (" %s\n", "-a, --authorization=AUTH_PAIR");
diff --git a/plugins/common.h b/plugins/common.h
index 47b1e4df..603bae55 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -91,16 +91,10 @@
 # define GET_NUMBER_OF_CPUS() -1
 #endif
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>