Patch 8.1.1621

[Bram Moolenaar]

Patch 8.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)
Files: src/evalfunc.c, src/os_amiga.h


*** ../vim-8.1.1620/src/evalfunc.c 2019-06-30 22:16:06.927821778 +0200
--- src/evalfunc.c 2019-07-03 22:47:38.521706557 +0200
***************
*** 16,25 ****

#if defined(FEAT_EVAL) || defined(PROTO)

- #ifdef AMIGA
- # include <time.h> /* for strftime() */
- #endif
-
#ifdef VMS
# include <float.h>
#endif
--- 16,21 ----
*** ../vim-8.1.1620/src/os_amiga.h 2019-07-01 22:28:17.021168470 +0200
--- src/os_amiga.h 2019-07-03 22:48:15.313452847 +0200
***************
*** 90,99 ****
# include <unistd.h>
# include <limits.h>
# include <errno.h>
- # include <time.h>
# include <dirent.h>
#endif

#ifndef PROTO
/*
* arpbase.h must be included before functions.h
--- 90,100 ----
# include <unistd.h>
# include <limits.h>
# include <errno.h>
# include <dirent.h>
#endif

+ #include <time.h> // for strftime() and others
+
#ifndef PROTO
/*
* arpbase.h must be included before functions.h
*** ../vim-8.1.1620/src/version.c 2019-07-03 22:50:37.204501383 +0200
--- src/version.c 2019-07-03 22:52:34.059830058 +0200
***************
*** 779,780 ****
--- 779,782 ----
{ /* Add new patch number below this line */
+ /**/
+ 1621,
/**/

--
You were lucky to have a LAKE! There were a hundred and sixty of
us living in a small shoebox in the middle of the road.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///