From 80edda1cf57d7bf8f22c021d724faab33c3c81d6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 3 Jul 2019 22:53:06 +0200
Subject: patch 8.1.1621: Amiga: time.h included twice
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 | 4 ----
 src/os_amiga.h | 3 ++-
 src/version.c  | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index f87fd1f99..7c9860f8a 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 718241dd7..6f951fb96 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 9af898854..8fd5239f1 100644
--- 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,
 /**/
-- 
cgit v1.2.1