commit 80edda1cf57d7bf8f22c021d724faab33c3c81d6
author Bram Moolenaar <Bram@vim.org> Wed Jul 03 22:53:06 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Jul 03 22:53:06 2019 +0200
tree 1bfd0050c05d0dbe8f7d2160eb241e20f58d9ff7
parent ba45f1f4fbff1a78ed5786c2608b0f8a76ec53c8

patch 8.1.1621: Amiga: time.h included twice

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)

src/evalfunc.c

diff --git a/src/evalfunc.c b/src/evalfunc.c
index f87fd1f..7c9860f 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

src/os_amiga.h

diff --git a/src/os_amiga.h b/src/os_amiga.h
index 718241d..6f951fb 100644
--- a/src/os_amiga.h
+++ b/src/os_amiga.h
@@ -90,10 +90,11 @@
 # 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

src/version.c

diff --git a/src/version.c b/src/version.c
index 9af8988..8fd5239 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1621,
+/**/
     1620,
 /**/
     1619,