Skip to content

Commit 779a775

Browse files
committed
patch 7.4.1218
Problem: Missing change in configure. More changes for function style. Solution: Avoid the typos.
1 parent 20fb9f3 commit 779a775

5 files changed

Lines changed: 25 additions & 15 deletions

File tree

runtime/tools/ccfilter.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ const char USAGE[] =
8585

8686

8787
int ShowUsage( char *szError )
88-
{ int i;
88+
{
89+
int i;
8990

9091
fprintf( stderr, USAGE );
9192

@@ -101,7 +102,8 @@ int ShowUsage( char *szError )
101102
return 0;
102103
}
103104

104-
char *echogets(char *s, int echo) {
105+
char *echogets(char *s, int echo)
106+
{
105107
char * const retval=fgets(s, LINELENGTH, stdin);
106108
if (echo!=0 && retval!=NULL) {
107109
fputs(retval, stderr);

src/config.h.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@
296296
/* #undef STDC_HEADERS */
297297

298298
/* instead, we check a few STDC things ourselves */
299-
#undef HAVE_STDARG_H
300299
#undef HAVE_STDLIB_H
301300
#undef HAVE_STRING_H
302301

src/configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2994,7 +2994,7 @@ if test $ac_cv_header_sys_wait_h = no; then
29942994
AC_MSG_RESULT(no))
29952995
fi
29962996

2997-
AC_CHECK_HEADERS(stdarg.h stdint.h stdlib.h string.h \
2997+
AC_CHECK_HEADERS(stdint.h stdlib.h string.h \
29982998
sys/select.h sys/utsname.h termcap.h fcntl.h \
29992999
sgtty.h sys/ioctl.h sys/time.h sys/types.h \
30003000
termio.h iconv.h inttypes.h langinfo.h math.h \

src/os_msdos.c

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,7 @@ mytextbackground(int iBkgColor)
370370
*/
371371

372372
static long
373-
mygetdigits(pp)
374-
char_u **pp;
373+
mygetdigits(char_u **pp)
375374
{
376375
char_u *p;
377376
long retval = 0;
@@ -473,7 +472,7 @@ translate_altkeys(int rawkey)
473472
* Set normal fg/bg color, based on T_ME. Called when t_me has been set.
474473
*/
475474
void
476-
mch_set_normal_colors()
475+
mch_set_normal_colors(void)
477476
{
478477
char_u *p;
479478
int n;
@@ -1232,8 +1231,16 @@ cbrk_handler(void)
12321231
* For DOS 3 and later return 3 (Fail)
12331232
*/
12341233
static void interrupt
1235-
catch_cint(bp, di, si, ds, es, dx, cx, bx, ax)
1236-
unsigned bp, di, si, ds, es, dx, cx, bx, ax;
1234+
catch_cint(
1235+
unsigned bp,
1236+
unsigned di,
1237+
unsigned si,
1238+
unsigned ds,
1239+
unsigned es,
1240+
unsigned dx,
1241+
unsigned cx,
1242+
unsigned bx,
1243+
unsigned ax)
12371244
{
12381245
ax = (ax & 0xff00); /* set AL to 0 */
12391246
if (_osmajor >= 3)
@@ -1876,7 +1883,7 @@ mch_set_shellsize(void)
18761883
* Rows and/or Columns has changed.
18771884
*/
18781885
void
1879-
mch_new_shellsize()
1886+
mch_new_shellsize(void)
18801887
{
18811888
#ifdef FEAT_MOUSE
18821889
/* best guess for mouse coordinate computations */
@@ -1897,7 +1904,7 @@ mch_new_shellsize()
18971904
* DOS console when 'columns' is set to a too large value.
18981905
*/
18991906
void
1900-
mch_check_columns()
1907+
mch_check_columns(void)
19011908
{
19021909
static union REGS regs;
19031910

@@ -2946,10 +2953,10 @@ mch_isdir(char_u *name)
29462953
* Return -1 if unknown.
29472954
*/
29482955
int
2949-
mch_can_exe(name, path, use_path)
2950-
char_u *name;
2951-
char_u **path;
2952-
int use_path;
2956+
mch_can_exe(
2957+
char_u *name,
2958+
char_u **path,
2959+
int use_path)
29532960
{
29542961
char *p;
29552962
int mode;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,8 @@ static char *(features[]) =
746746

747747
static int included_patches[] =
748748
{ /* Add new patch number below this line */
749+
/**/
750+
1218,
749751
/**/
750752
1217,
751753
/**/

0 commit comments

Comments
 (0)