Mercurial > vim
changeset 17243:24f42f0bf27e v8.1.1621
patch 8.1.1621: Amiga: time.h included twice
commit https://github.com/vim/vim/commit/80edda1cf57d7bf8f22c021d724faab33c3c81d6
Author: Bram Moolenaar <Bram@vim.org>
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)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 03 Jul 2019 23:00:10 +0200 |
parents | 356d7a1082f5 |
children | dbfac1327a2e |
files | src/evalfunc.c src/os_amiga.h src/version.c |
diffstat | 3 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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