diff options
author | Bram Moolenaar <Bram@vim.org> | 2010-12-17 18:06:06 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2010-12-17 18:06:06 +0100 |
commit | 9c26303293f9bbab75d7074038dec0d33f4eb635 (patch) | |
tree | 7bfda2c6111a9a0f2390ea6a917b5dd8db104e67 /src | |
parent | 0215e8e15bb97299cc1b00d3bae877309dadc505 (diff) |
updated for version 7.3.085v7.3.085
Problem: Inconsistency with preproc symbols. void * computation.
Solution: Include vimio.h from vim.h. Add type cast.
Diffstat (limited to 'src')
-rw-r--r-- | src/eval.c | 3 | ||||
-rw-r--r-- | src/ex_cmds.c | 4 | ||||
-rw-r--r-- | src/ex_cmds2.c | 4 | ||||
-rw-r--r-- | src/fileio.c | 10 | ||||
-rw-r--r-- | src/if_cscope.c | 3 | ||||
-rw-r--r-- | src/if_sniff.c | 1 | ||||
-rw-r--r-- | src/main.c | 4 | ||||
-rw-r--r-- | src/memfile.c | 4 | ||||
-rw-r--r-- | src/memline.c | 4 | ||||
-rw-r--r-- | src/netbeans.c | 4 | ||||
-rw-r--r-- | src/os_msdos.c | 1 | ||||
-rw-r--r-- | src/os_mswin.c | 1 | ||||
-rw-r--r-- | src/os_win16.c | 1 | ||||
-rw-r--r-- | src/os_win32.c | 1 | ||||
-rw-r--r-- | src/spell.c | 4 | ||||
-rw-r--r-- | src/tag.c | 4 | ||||
-rw-r--r-- | src/undo.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim.h | 5 |
19 files changed, 8 insertions, 56 deletions
diff --git a/src/eval.c b/src/eval.c index 4d7afa043c..7d00c0e478 100644 --- 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 8a24c0a717..3678083b36 100644 --- 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 8a7498a582..e78b15928e 100644 --- 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 2828aa72af..fcfb8cd308 100644 --- 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 1a377da85d..bc8ea94638 100644 --- 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 d82f4e59b3..a9e9be022c 100644 --- 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 faf574a9b3..895a435992 100644 --- 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 e9fe314e42..2d83ce8246 100644 --- 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 7393324abe..d978b9020b 100644 --- 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 f85e7d07da..c0611d598d 100644 --- 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 0df20c72b4..1b52d72c4b 100644 --- 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 e725e69f07..7dcc053696 100644 --- 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 ba3407241e..66ca198ed2 100644 --- 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 0dd7a82864..dcf95ee274 100644 --- 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 6716a6ca81..29cf687781 100644 --- 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) @@ -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 bcf9463eb4..ec7b1a4aec 100644 --- 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 9e0ed46892..7372e9a1c3 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 85, +/**/ 84, /**/ 83, @@ -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 */ |