aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1621: Amiga: time.h included twice

Browse Source 
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)
This commit is contained in:
Bram Moolenaar 2019-07-03 22:53:06 +02:00
parent ba45f1f4fb
commit 80edda1cf5
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/evalfunc.c
View File

@ -16,10 +16,6 @@
#if defined(FEAT_EVAL) || defined(PROTO) #if defined(FEAT_EVAL) || defined(PROTO)
#ifdef AMIGA
# include <time.h> /* for strftime() */
#endif
#ifdef VMS #ifdef VMS
# include <float.h> # include <float.h>
#endif #endif

3
src/os_amiga.h
View File

@ -90,10 +90,11 @@ typedef long off_t;
# include <unistd.h> # include <unistd.h>
# include <limits.h> # include <limits.h>
# include <errno.h> # include <errno.h>
# include <time.h>
# include <dirent.h> # include <dirent.h>
#endif #endif
#include <time.h> // for strftime() and others
#ifndef PROTO #ifndef PROTO
/* /*
* arpbase.h must be included before functions.h * arpbase.h must be included before functions.h

2
src/version.c
View File

@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1621,
/**/ /**/
1620, 1620,
/**/ /**/