changeset 29241:1690417aeafe v8.2.5139

patch 8.2.5139: TIME_WITH_SYS_TIME is no longer supported by autoconf Commit: https://github.com/vim/vim/commit/300d71881957f8e60e48eda19002ce5e25fd9c06 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jun 20 12:01:10 2022 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Mon, 20 Jun 2022 13:15:03 +0200
parents 181099d99271
children 8095f317cb9c
files src/os_unix.h src/version.c
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5139,
+/**/
     5138,
 /**/
     5137,