diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-03 22:53:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-03 22:53:06 +0200 |
| commit | 80edda1cf57d7bf8f22c021d724faab33c3c81d6 (patch) | |
| tree | 1bfd0050c05d0dbe8f7d2160eb241e20f58d9ff7 | |
| parent | ba45f1f4fbff1a78ed5786c2608b0f8a76ec53c8 (diff) | |
patch 8.1.1621: Amiga: time.h included twicev8.1.1621
Problem: Amiga: time.h included twice.
Solution: Remove include from evalfunc.c, move outside of #ifdef in
os_amiga.h. (Ola Söder, closes #4607)
| -rw-r--r-- | src/evalfunc.c | 4 | ||||
| -rw-r--r-- | src/os_amiga.h | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index f87fd1f99a..7c9860f8a1 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -16,10 +16,6 @@ #if defined(FEAT_EVAL) || defined(PROTO) -#ifdef AMIGA -# include <time.h> /* for strftime() */ -#endif - #ifdef VMS # include <float.h> #endif diff --git a/src/os_amiga.h b/src/os_amiga.h index 718241dd76..6f951fb96b 100644 --- a/src/os_amiga.h +++ b/src/os_amiga.h @@ -90,10 +90,11 @@ typedef long off_t; # include <unistd.h> # include <limits.h> # include <errno.h> -# include <time.h> # include <dirent.h> #endif +#include <time.h> // for strftime() and others + #ifndef PROTO /* * arpbase.h must be included before functions.h diff --git a/src/version.c b/src/version.c index 9af898854d..8fd5239f12 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1621, +/**/ 1620, /**/ 1619, |