summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2006-09-26 11:48:34 +0000
committervimboss <devnull@localhost>2006-09-26 11:48:34 +0000
commitee256f10e0b49497cb4c0916b07efacaa2ec2173 (patch)
tree2405448192d99d38b72eb4e6092422a3399cf3a7
parentd25eee85c335a9187506ff976fa2012162648332 (diff)
downloadvim-ee256f10e0b49497cb4c0916b07efacaa2ec2173.tar.gz
updated for version 7.0-110v7.0.110v7-0-110
-rw-r--r--src/memfile.c8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/memfile.c b/src/memfile.c
index aeeb8cba..0f070911 100644
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -517,7 +517,7 @@ mf_free(mfp, hp)
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 */
extern unsigned long *__stdfiledes;
@@ -677,15 +677,19 @@ mf_sync(mfp, flags)
# else
# 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),
* but ain't got no prototype anywhere. */
extern unsigned long fdtofh(int filedescriptor);
# endif
+# if !defined(__libnix__)
+ fflush(NULL);
+# else
BPTR fh = (BPTR)fdtofh(mfp->mf_fd);
if (fh != 0)
Flush(fh);
+# endif
}
# else /* assume Manx */
Flush(_devtab[mfp->mf_fd].fd);
diff --git a/src/version.c b/src/version.c
index 3a4c118b..d5ba9054 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 110,
+/**/
109,
/**/
108,