updated for version 7.3.085

Problem:    Inconsistency with preproc symbols.  void * computation.
Solution:   Include vimio.h from vim.h.  Add type cast.

diff --git a/src/eval.c b/src/eval.c
index 4d7afa043c62a098f71c40c90ffdadab736c875e..7d00c0e47839c48c59690b952f5d75bac02b5a25 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -10,9 +10,6 @@
 /*
  * eval.c: Expression evaluation.
  */
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for mch_open(), must be before vim.h */
-#endif
 
 #include "vim.h"
 

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 8a24c0a71795da51791b66ecd05b2c40ebff4cba..3678083b36a7604d5fdc262ea8d17f56c28ca8e8 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -11,10 +11,6 @@
  * ex_cmds.c: some functions for command line commands
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 #include "version.h"
 

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 8a7498a58228839faccce90c1a5de88d9934e5b4..e78b15928e8960e399c0e53503da002c28006e55 100644 (file)
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -11,10 +11,6 @@
  * ex_cmds2.c: some more functions for command line commands
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 #include "version.h"
 

diff --git a/src/fileio.c b/src/fileio.c
index 2828aa72af4a24dddc61a0456e7bdbb6e231c1cb..fcfb8cd308005a5d4548b6d6d15e1a10e975ad1e 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -11,14 +11,6 @@
  * fileio.c: read from and write to a file
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for lseek(), must be before vim.h */
-#endif
-
-#if defined __EMX__
-# include "vimio.h"    /* for mktemp(), CJW 1997-12-03 */
-#endif
-
 #include "vim.h"
 
 #if defined(__TANDEM) || defined(__MINT__)
@@ -10336,7 +10328,7 @@ write_eintr(fd, buf, bufsize)
      * by a signal. */
     while (ret < (long)bufsize)
     {
-       wlen = vim_write(fd, buf + ret, bufsize - ret);
+       wlen = vim_write(fd, (char *)buf + ret, bufsize - ret);
        if (wlen < 0)
        {
            if (errno != EINTR)

diff --git a/src/if_cscope.c b/src/if_cscope.c
index 1a377da85d0d35445dd5a788947409ab2b7b32ef..bc8ea946389cb14ebd0c1fd20db574b65d5e34d2 100644 (file)
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -20,9 +20,6 @@
 #include <sys/stat.h>
 #if defined(UNIX)
 # include <sys/wait.h>
-#else
-    /* not UNIX, must be WIN32 */
-# include "vimio.h"
 #endif
 #include "if_cscope.h"
 

diff --git a/src/if_sniff.c b/src/if_sniff.c
index d82f4e59b34156c5e3250c29da7088308739bf4a..a9e9be022c684403a2287e567846c37e69ac76ef 100644 (file)
--- a/src/if_sniff.c
+++ b/src/if_sniff.c
@@ -9,7 +9,6 @@
 
 #ifdef WIN32
 # include <stdio.h>
-# include "vimio.h"
 # include <process.h>
 # include <string.h>
 # include <assert.h>

diff --git a/src/main.c b/src/main.c
index faf574a9b3ad9c63ea56a8aee6ea1be20478f6f0..895a4359928ddcc18d7d6b09ee093e19785e8819 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -7,10 +7,6 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"            /* for close() and dup() */
-#endif
-
 #define EXTERN
 #include "vim.h"
 

diff --git a/src/memfile.c b/src/memfile.c
index e9fe314e427d471be92d1b10dbaf252e2757e454..2d83ce824677139fc99693ed885af87e2deb024c 100644 (file)
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -32,10 +32,6 @@
  * file is opened.
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for lseek(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 /*

diff --git a/src/memline.c b/src/memline.c
index 7393324abe7a65100f74980e0cfe74c59d03f632..d978b9020bfbc1e23d479c95fc45bbc25d9ef93e 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -42,10 +42,6 @@
  *  mf_get().
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 #ifndef UNIX           /* it's in os_unix.h for Unix */

diff --git a/src/netbeans.c b/src/netbeans.c
index f85e7d07da363095e7db49b02131c2fe514c6dd8..c0611d598d545193541b42174c3602c5a8b00892 100644 (file)
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -16,10 +16,6 @@
  * See ":help netbeans-protocol" for explanation.
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO)

diff --git a/src/os_msdos.c b/src/os_msdos.c
index 0df20c72b4404d4e09833691648b06ff0e8779c0..1b52d72c4b592576505d03fd8cfa521913714059 100644 (file)
--- a/src/os_msdos.c
+++ b/src/os_msdos.c
@@ -21,7 +21,6 @@
  * Some functions are also used for Win16 (MS-Windows 3.1).
  */
 
-#include "vimio.h"
 #include "vim.h"
 
 #include <conio.h>

diff --git a/src/os_mswin.c b/src/os_mswin.c
index e725e69f07b4acbb0ec2b699aeb78f508e948236..7dcc053696ebfb72b36483dfec65c09b533decda 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -22,7 +22,6 @@
 # endif
 #endif
 
-#include "vimio.h"
 #include "vim.h"
 
 #ifdef WIN16

diff --git a/src/os_win16.c b/src/os_win16.c
index ba3407241e3a6fa9e06180615f5e5fe0b7ae3993..66ca198ed294fc37272541aaa82f21ed58b2abc0 100644 (file)
--- a/src/os_win16.c
+++ b/src/os_win16.c
@@ -20,7 +20,6 @@
 # pragma warn -obs
 #endif
 
-#include "vimio.h"
 #include "vim.h"
 
 #include <dos.h>

diff --git a/src/os_win32.c b/src/os_win32.c
index 0dd7a82864820160185ce1d66b6f39a919929876..dcf95ee2748a68f7ba2ae7bdd8033d9f2be8a95f 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -20,7 +20,6 @@
  * Roger Knobbe <rogerk@wonderware.com> did the initial port of Vim 3.0.
  */
 
-#include "vimio.h"
 #include "vim.h"
 
 #ifdef FEAT_MZSCHEME

diff --git a/src/spell.c b/src/spell.c
index 6716a6ca818aa1bb0d6ae28a265c77155fa36d20..29cf68778179e15174771f584ceb5e9992c85d6b 100644 (file)
--- a/src/spell.c
+++ b/src/spell.c
@@ -303,10 +303,6 @@
  *                         few bytes as possible, see offset2bytes())
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for lseek(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 #if defined(FEAT_SPELL) || defined(PROTO)

diff --git a/src/tag.c b/src/tag.c
index 50c3ce6927fde986b355762d39d0ac3d5a10c1c2..0baa2c2de27428808e1c21cea745a25c4f5d714f 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -11,10 +11,6 @@
  * Code to handle tags and the tag stack
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for lseek(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 /*

diff --git a/src/undo.c b/src/undo.c
index bcf9463eb4a5e659ee2b3f46f318ce6b9c27860d..ec7b1a4aec7e1f07622549a842dc3833727050cd 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -81,10 +81,6 @@
 #define UH_MAGIC 0x18dade      /* value for uh_magic when in use */
 #define UE_MAGIC 0xabc123      /* value for ue_magic when in use */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"    /* for vim_read(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 static void u_unch_branch __ARGS((u_header_T *uhp));

diff --git a/src/version.c b/src/version.c
index 9e0ed468929c4b1f2d51ef49005738629dd48b15..7372e9a1c3bfa1c2eab4bc81905284063eb35e15 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    85,
 /**/
     84,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 60e91c752c720b7e5268b40966ea101e1bbe7116..5eea08504da286deb9d470320718f60e03478ffa 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -27,6 +27,11 @@
 # endif
 #endif
 
+#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) \
+       || defined(__EMX__)
+# include "vimio.h"
+#endif
+
 /* ============ the header file puzzle (ca. 50-100 pieces) ========= */
 
 #ifdef HAVE_CONFIG_H   /* GNU autoconf (or something else) was here */