thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.3.495

Browse Source 
Problem:    Compiler warnings.
Solution:   Add function declaration.  Remove "offset" argument.
This commit is contained in:
Bram Moolenaar 2012-04-09 20:42:26 +02:00
parent bd2f3c3ec6
commit b345d49e06
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/misc1.c
View File

@ -4972,6 +4972,7 @@ static int cin_isif __ARGS((char_u *));
static int cin_iselse __ARGS((char_u *)); static int cin_iselse __ARGS((char_u *));
static int cin_isdo __ARGS((char_u *)); static int cin_isdo __ARGS((char_u *));
static int cin_iswhileofdo __ARGS((char_u *, linenr_T, int)); static int cin_iswhileofdo __ARGS((char_u *, linenr_T, int));
static int cin_is_if_for_while_before_offset __ARGS((char_u *line, int *poffset));
static int cin_iswhileofdo_end __ARGS((int terminated, int ind_maxparen, int ind_maxcomment)); static int cin_iswhileofdo_end __ARGS((int terminated, int ind_maxparen, int ind_maxcomment));
static int cin_isbreak __ARGS((char_u *)); static int cin_isbreak __ARGS((char_u *));
static int cin_is_cpp_baseclass __ARGS((colnr_T *col)); static int cin_is_cpp_baseclass __ARGS((colnr_T *col));
@ -5771,17 +5772,17 @@ cin_iswhileofdo(p, lnum, ind_maxparen) /* XXX */
} }
/* /*
* Check whether in "p" there is an "if", "for" or "while" before offset. * Check whether in "p" there is an "if", "for" or "while" before "*poffset".
* Return 0 if there is none. * Return 0 if there is none.
* Otherwise return !0 and update "*poffset" to point to the place where the * Otherwise return !0 and update "*poffset" to point to the place where the
* string was found. * string was found.
*/ */
static int static int
cin_is_if_for_while_before_offset(line, offset, poffset) cin_is_if_for_while_before_offset(line, poffset)
char_u *line; char_u *line;
size_t offset;
int *poffset; int *poffset;
{ {
int offset = *poffset;
if (offset-- < 2) if (offset-- < 2)
return 0; return 0;
@ -5805,8 +5806,8 @@ cin_is_if_for_while_before_offset(line, offset, poffset)
goto probablyFound; goto probablyFound;
} }
} }
return 0; return 0;
probablyFound: probablyFound:
if (!offset || !vim_isIDc(line[offset - 1])) if (!offset || !vim_isIDc(line[offset - 1]))
{ {
@ -6890,8 +6891,7 @@ get_c_indent()
line = ml_get(outermost.lnum); line = ml_get(outermost.lnum);
is_if_for_while = is_if_for_while =
cin_is_if_for_while_before_offset(line, outermost.col, cin_is_if_for_while_before_offset(line, &outermost.col);
&outermost.col);
} }
amount = skip_label(our_paren_pos.lnum, &look, ind_maxcomment); amount = skip_label(our_paren_pos.lnum, &look, ind_maxcomment);

2
src/version.c
View File

@ -714,6 +714,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 */
/**/
495,
/**/ /**/
494, 494,
/**/ /**/