patch 7.4.1218

Problem:    Missing change in configure.  More changes for function style.
Solution:   Avoid the typos.
This commit is contained in:
Bram Moolenaar
2016-01-30 23:26:34 +01:00
parent 20fb9f3464
commit 779a7759ad
5 changed files with 25 additions and 15 deletions

View File

@ -85,7 +85,8 @@ const char USAGE[] =
int ShowUsage( char *szError ) int ShowUsage( char *szError )
{ int i; {
int i;
fprintf( stderr, USAGE ); fprintf( stderr, USAGE );
@ -101,7 +102,8 @@ int ShowUsage( char *szError )
return 0; return 0;
} }
char *echogets(char *s, int echo) { char *echogets(char *s, int echo)
{
char * const retval=fgets(s, LINELENGTH, stdin); char * const retval=fgets(s, LINELENGTH, stdin);
if (echo!=0 && retval!=NULL) { if (echo!=0 && retval!=NULL) {
fputs(retval, stderr); fputs(retval, stderr);

View File

@ -296,7 +296,6 @@
/* #undef STDC_HEADERS */ /* #undef STDC_HEADERS */
/* instead, we check a few STDC things ourselves */ /* instead, we check a few STDC things ourselves */
#undef HAVE_STDARG_H
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
#undef HAVE_STRING_H #undef HAVE_STRING_H

View File

@ -2994,7 +2994,7 @@ if test $ac_cv_header_sys_wait_h = no; then
AC_MSG_RESULT(no)) AC_MSG_RESULT(no))
fi fi
AC_CHECK_HEADERS(stdarg.h stdint.h stdlib.h string.h \ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \
sys/select.h sys/utsname.h termcap.h fcntl.h \ sys/select.h sys/utsname.h termcap.h fcntl.h \
sgtty.h sys/ioctl.h sys/time.h sys/types.h \ sgtty.h sys/ioctl.h sys/time.h sys/types.h \
termio.h iconv.h inttypes.h langinfo.h math.h \ termio.h iconv.h inttypes.h langinfo.h math.h \

View File

@ -370,8 +370,7 @@ mytextbackground(int iBkgColor)
*/ */
static long static long
mygetdigits(pp) mygetdigits(char_u **pp)
char_u **pp;
{ {
char_u *p; char_u *p;
long retval = 0; long retval = 0;
@ -473,7 +472,7 @@ translate_altkeys(int rawkey)
* Set normal fg/bg color, based on T_ME. Called when t_me has been set. * Set normal fg/bg color, based on T_ME. Called when t_me has been set.
*/ */
void void
mch_set_normal_colors() mch_set_normal_colors(void)
{ {
char_u *p; char_u *p;
int n; int n;
@ -1232,8 +1231,16 @@ cbrk_handler(void)
* For DOS 3 and later return 3 (Fail) * For DOS 3 and later return 3 (Fail)
*/ */
static void interrupt static void interrupt
catch_cint(bp, di, si, ds, es, dx, cx, bx, ax) catch_cint(
unsigned bp, di, si, ds, es, dx, cx, bx, ax; unsigned bp,
unsigned di,
unsigned si,
unsigned ds,
unsigned es,
unsigned dx,
unsigned cx,
unsigned bx,
unsigned ax)
{ {
ax = (ax & 0xff00); /* set AL to 0 */ ax = (ax & 0xff00); /* set AL to 0 */
if (_osmajor >= 3) if (_osmajor >= 3)
@ -1876,7 +1883,7 @@ mch_set_shellsize(void)
* Rows and/or Columns has changed. * Rows and/or Columns has changed.
*/ */
void void
mch_new_shellsize() mch_new_shellsize(void)
{ {
#ifdef FEAT_MOUSE #ifdef FEAT_MOUSE
/* best guess for mouse coordinate computations */ /* best guess for mouse coordinate computations */
@ -1897,7 +1904,7 @@ mch_new_shellsize()
* DOS console when 'columns' is set to a too large value. * DOS console when 'columns' is set to a too large value.
*/ */
void void
mch_check_columns() mch_check_columns(void)
{ {
static union REGS regs; static union REGS regs;
@ -2946,10 +2953,10 @@ mch_isdir(char_u *name)
* Return -1 if unknown. * Return -1 if unknown.
*/ */
int int
mch_can_exe(name, path, use_path) mch_can_exe(
char_u *name; char_u *name,
char_u **path; char_u **path,
int use_path; int use_path)
{ {
char *p; char *p;
int mode; int mode;

View File

@ -746,6 +746,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 */
/**/
1218,
/**/ /**/
1217, 1217,
/**/ /**/