diff options
| -rw-r--r-- | runtime/tools/ccfilter.c | 6 | ||||
| -rw-r--r-- | src/config.h.in | 1 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/os_msdos.c | 29 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 25 insertions, 15 deletions
diff --git a/runtime/tools/ccfilter.c b/runtime/tools/ccfilter.c index 270333910..f5d560dba 100644 --- a/runtime/tools/ccfilter.c +++ b/runtime/tools/ccfilter.c @@ -85,7 +85,8 @@ const char USAGE[] = int ShowUsage( char *szError ) -{ int i; +{ + int i; fprintf( stderr, USAGE ); @@ -101,7 +102,8 @@ int ShowUsage( char *szError ) return 0; } -char *echogets(char *s, int echo) { +char *echogets(char *s, int echo) +{ char * const retval=fgets(s, LINELENGTH, stdin); if (echo!=0 && retval!=NULL) { fputs(retval, stderr); diff --git a/src/config.h.in b/src/config.h.in index 9807bd23e..8e115f5f1 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -296,7 +296,6 @@ /* #undef STDC_HEADERS */ /* instead, we check a few STDC things ourselves */ -#undef HAVE_STDARG_H #undef HAVE_STDLIB_H #undef HAVE_STRING_H diff --git a/src/configure.in b/src/configure.in index ffa0b2ded..08ba5623e 100644 --- a/src/configure.in +++ b/src/configure.in @@ -2994,7 +2994,7 @@ if test $ac_cv_header_sys_wait_h = no; then AC_MSG_RESULT(no)) 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 \ sgtty.h sys/ioctl.h sys/time.h sys/types.h \ termio.h iconv.h inttypes.h langinfo.h math.h \ diff --git a/src/os_msdos.c b/src/os_msdos.c index 1b75a30f7..840f654fb 100644 --- a/src/os_msdos.c +++ b/src/os_msdos.c @@ -370,8 +370,7 @@ mytextbackground(int iBkgColor) */ static long -mygetdigits(pp) - char_u **pp; +mygetdigits(char_u **pp) { char_u *p; 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. */ void -mch_set_normal_colors() +mch_set_normal_colors(void) { char_u *p; int n; @@ -1232,8 +1231,16 @@ cbrk_handler(void) * For DOS 3 and later return 3 (Fail) */ static void interrupt -catch_cint(bp, di, si, ds, es, dx, cx, bx, ax) - unsigned bp, di, si, ds, es, dx, cx, bx, ax; +catch_cint( + 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 */ if (_osmajor >= 3) @@ -1876,7 +1883,7 @@ mch_set_shellsize(void) * Rows and/or Columns has changed. */ void -mch_new_shellsize() +mch_new_shellsize(void) { #ifdef FEAT_MOUSE /* best guess for mouse coordinate computations */ @@ -1897,7 +1904,7 @@ mch_new_shellsize() * DOS console when 'columns' is set to a too large value. */ void -mch_check_columns() +mch_check_columns(void) { static union REGS regs; @@ -2946,10 +2953,10 @@ mch_isdir(char_u *name) * Return -1 if unknown. */ int -mch_can_exe(name, path, use_path) - char_u *name; - char_u **path; - int use_path; +mch_can_exe( + char_u *name, + char_u **path, + int use_path) { char *p; int mode; diff --git a/src/version.c b/src/version.c index d57420b08..dd2f95d48 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1218, +/**/ 1217, /**/ 1216, |