adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.3.085

Browse Source 
Problem:    Inconsistency with preproc symbols.  void * computation.
Solution:   Include vimio.h from vim.h.  Add type cast.
This commit is contained in:
Bram Moolenaar
2010-12-17 18:06:06 +01:00
parent 0215e8e15b
commit 9c26303293
19 changed files with 8 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/eval.c
View File

@ -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"

4
src/ex_cmds.c
View File

@ -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"

4
src/ex_cmds2.c
View File

@ -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"

10
src/fileio.c
View File

@ -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)

3
src/if_cscope.c
View File

@ -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"

1
src/if_sniff.c
View File

@ -9,7 +9,6 @@
#ifdef WIN32
# include <stdio.h>
# include "vimio.h"
# include <process.h>
# include <string.h>
# include <assert.h>

4
src/main.c
View File

@ -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"

4
src/memfile.c
View File

@ -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"
/*

4
src/memline.c
View File

@ -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 */

4
src/netbeans.c
View File

@ -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)

1
src/os_msdos.c
View File

@ -21,7 +21,6 @@
* Some functions are also used for Win16 (MS-Windows 3.1).
*/
#include "vimio.h"
#include "vim.h"
#include <conio.h>

1
src/os_mswin.c
View File

@ -22,7 +22,6 @@
# endif
#endif
#include "vimio.h"
#include "vim.h"
#ifdef WIN16

1
src/os_win16.c
View File

@ -20,7 +20,6 @@
# pragma warn -obs
#endif
#include "vimio.h"
#include "vim.h"
#include <dos.h>

1
src/os_win32.c
View File

@ -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

4
src/spell.c
View File

@ -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)

4
src/tag.c
View File

@ -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"
/*

4
src/undo.c
View File

@ -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));

2
src/version.c
View File

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

5
src/vim.h
View File

@ -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 */