0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

updated for version 7.0-110

This commit is contained in:
Bram Moolenaar
2006-09-26 11:48:34 +00:00
parent 15ff6c1940
commit 89f3727bd9
2 changed files with 8 additions and 2 deletions

View File

@@ -517,7 +517,7 @@ mf_free(mfp, hp)
mf_ins_free(mfp, hp); /* put *hp in the free list */ mf_ins_free(mfp, hp); /* put *hp in the free list */
} }
#if defined(__MORPHOS__) #if defined(__MORPHOS__) && defined(__libnix__)
/* function is missing in MorphOS libnix version */ /* function is missing in MorphOS libnix version */
extern unsigned long *__stdfiledes; extern unsigned long *__stdfiledes;
@@ -677,15 +677,19 @@ mf_sync(mfp, flags)
# else # else
# if defined(_DCC) || defined(__GNUC__) || defined(__MORPHOS__) # if defined(_DCC) || defined(__GNUC__) || defined(__MORPHOS__)
{ {
# if defined(__GNUC__) && !defined(__MORPHOS__) # if defined(__GNUC__) && !defined(__MORPHOS__) && defined(__libnix__)
/* Have function (in libnix at least), /* Have function (in libnix at least),
* but ain't got no prototype anywhere. */ * but ain't got no prototype anywhere. */
extern unsigned long fdtofh(int filedescriptor); extern unsigned long fdtofh(int filedescriptor);
# endif # endif
# if !defined(__libnix__)
fflush(NULL);
# else
BPTR fh = (BPTR)fdtofh(mfp->mf_fd); BPTR fh = (BPTR)fdtofh(mfp->mf_fd);
if (fh != 0) if (fh != 0)
Flush(fh); Flush(fh);
# endif
} }
# else /* assume Manx */ # else /* assume Manx */
Flush(_devtab[mfp->mf_fd].fd); Flush(_devtab[mfp->mf_fd].fd);

View File

@@ -666,6 +666,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 */
/**/
110,
/**/ /**/
109, 109,
/**/ /**/