patch 8.2.5139: TIME_WITH_SYS_TIME is no longer supported by autoconf

Problem:    TIME_WITH_SYS_TIME is no longer supported by autoconf.
Solution:   Always include time.h.

diff --git a/src/os_unix.h b/src/os_unix.h
index c3a7fec19a1a8a337d561128a7644d6d90cd88ca..00ae239ea20d35a9363b26ca92759af963487981 100644 (file)
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -128,10 +128,7 @@
 # endif
 #endif
 
-// on some systems time.h should not be included together with sys/time.h
-#if !defined(HAVE_SYS_TIME_H) || defined(TIME_WITH_SYS_TIME)
-# include <time.h>
-#endif
+#include <time.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif

diff --git a/src/version.c b/src/version.c
index 0422787384a165080134df7e3eff9a27421a6c06..370c4d06f3623c4b7c01bffe8b0ac404e7488987 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5139,
 /**/
     5138,
 /**/