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)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index f87fd1f99a079aa03436967ec3b06341b95ca0ac..7c9860f8a1ee6dd88c2ee2f398d01ddf3a48090d 100644 (file)
--- 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 718241dd768f97020369b5c1b3090766f100263f..6f951fb96b861157a15079972917bbb0111df55f 100644 (file)
--- 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 9af898854dbbc1880fd0b8a982c0337772cf4077..8fd5239f12df7d98ab78df6abeb74c8a97e7899c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1621,
 /**/
     1620,
 /**/