From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 20 Jun 2022 11:01:10 +0000 (+0100)
Subject: patch 8.2.5139: TIME_WITH_SYS_TIME is no longer supported by autoconf
X-Git-Tag: v8.2.5139
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=300d71881957f8e60e48eda19002ce5e25fd9c06;p=vim

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 c3a7fec19..00ae239ea 100644
--- 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 042278738..370c4d06f 100644
--- 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,
 /**/