diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-20 12:01:10 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-20 12:01:10 +0100 |
| commit | 300d71881957f8e60e48eda19002ce5e25fd9c06 (patch) | |
| tree | 910992d4fa770cb1914e07c5d7ec0b86994cc854 | |
| parent | 8088ae95bbed2085c5fb196850c4e4b8df55c989 (diff) | |
| download | vim-git-300d71881957f8e60e48eda19002ce5e25fd9c06.tar.gz | |
patch 8.2.5139: TIME_WITH_SYS_TIME is no longer supported by autoconfv8.2.5139
Problem: TIME_WITH_SYS_TIME is no longer supported by autoconf.
Solution: Always include time.h.
| -rw-r--r-- | src/os_unix.h | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 4 deletions
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 @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5139, +/**/ 5138, /**/ 5137, |