# HG changeset patch # User Bram Moolenaar # Date 1562187610 -7200 # Node ID 24f42f0bf27e22dc644ac67df31c8e67962c0738 # Parent 356d7a1082f536f35abc2e8ea9eb47d041ffb1a0 patch 8.1.1621: Amiga: time.h included twice commit https://github.com/vim/vim/commit/80edda1cf57d7bf8f22c021d724faab33c3c81d6 Author: Bram Moolenaar Date: Wed Jul 3 22:53:06 2019 +0200 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 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -16,10 +16,6 @@ #if defined(FEAT_EVAL) || defined(PROTO) -#ifdef AMIGA -# include /* for strftime() */ -#endif - #ifdef VMS # include #endif diff --git a/src/os_amiga.h b/src/os_amiga.h --- a/src/os_amiga.h +++ b/src/os_amiga.h @@ -90,10 +90,11 @@ typedef long off_t; # include # include # include -# include # include #endif +#include // for strftime() and others + #ifndef PROTO /* * arpbase.h must be included before functions.h diff --git a/src/version.c b/src/version.c --- 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,