Skip to content

Commit 68c2f63

Browse files
committed
patch 7.4.1208
Problem: Using old style function declarations. Solution: Change to new style function declarations. (script by Hirohito Higashi)
1 parent 66f948e commit 68c2f63

18 files changed

Lines changed: 687 additions & 981 deletions

src/gui_photon.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,9 +1111,7 @@ gui_ph_encoding_changed(int new_encoding)
11111111
/****************************************************************************/
11121112

11131113
void
1114-
gui_mch_prepare(argc, argv)
1115-
int *argc;
1116-
char **argv;
1114+
gui_mch_prepare(int *argc, char **argv)
11171115
{
11181116
PtInit(NULL);
11191117
}
@@ -1720,7 +1718,7 @@ gui_mch_iconify(void)
17201718
* Bring the Vim window to the foreground.
17211719
*/
17221720
void
1723-
gui_mch_set_foreground()
1721+
gui_mch_set_foreground(void)
17241722
{
17251723
PhWindowEvent_t event;
17261724

@@ -1860,8 +1858,7 @@ static int mshape_ids[] =
18601858
};
18611859

18621860
void
1863-
mch_set_mouse_shape(shape)
1864-
int shape;
1861+
mch_set_mouse_shape(int shape)
18651862
{
18661863
int id;
18671864

@@ -2184,7 +2181,7 @@ gui_mch_clear_block(int row1, int col1, int row2, int col2)
21842181
}
21852182

21862183
void
2187-
gui_mch_clear_all()
2184+
gui_mch_clear_all(void)
21882185
{
21892186
PhRect_t text_rect = {
21902187
{ gui.border_width, gui.border_width },
@@ -3078,9 +3075,7 @@ gui_mch_get_font(char_u *vim_font_name, int report_error)
30783075
* Don't know how to get the actual name, thus use the provided name.
30793076
*/
30803077
char_u *
3081-
gui_mch_get_fontname(font, name)
3082-
GuiFont font;
3083-
char_u *name;
3078+
gui_mch_get_fontname(GuiFont font, char_u *name)
30843079
{
30853080
if (name == NULL)
30863081
return NULL;

src/gui_w32.c

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,7 +2246,7 @@ im_set_active(int active)
22462246
* Get IM status. When IM is on, return not 0. Else return 0.
22472247
*/
22482248
int
2249-
im_get_status()
2249+
im_get_status(void)
22502250
{
22512251
int status = 0;
22522252
HIMC hImc;
@@ -4525,10 +4525,7 @@ typedef struct _signicon_t
45254525
} signicon_t;
45264526

45274527
void
4528-
gui_mch_drawsign(row, col, typenr)
4529-
int row;
4530-
int col;
4531-
int typenr;
4528+
gui_mch_drawsign(int row, int col, int typenr)
45324529
{
45334530
signicon_t *sign;
45344531
int x, y, w, h;
@@ -4605,8 +4602,7 @@ close_signicon_image(signicon_t *sign)
46054602
}
46064603

46074604
void *
4608-
gui_mch_register_sign(signfile)
4609-
char_u *signfile;
4605+
gui_mch_register_sign(char_u *signfile)
46104606
{
46114607
signicon_t sign, *psign;
46124608
char_u *ext;
@@ -4661,8 +4657,7 @@ gui_mch_register_sign(signfile)
46614657
}
46624658

46634659
void
4664-
gui_mch_destroy_sign(sign)
4665-
void *sign;
4660+
gui_mch_destroy_sign(void *sign)
46664661
{
46674662
if (sign)
46684663
{
@@ -4766,10 +4761,7 @@ multiline_balloon_available(void)
47664761
}
47674762

47684763
static void
4769-
make_tooltip(beval, text, pt)
4770-
BalloonEval *beval;
4771-
char *text;
4772-
POINT pt;
4764+
make_tooltip(BalloonEval *beval, char *text, POINT pt)
47734765
{
47744766
TOOLINFO *pti;
47754767
int ToolInfoSize;
@@ -4833,19 +4825,18 @@ make_tooltip(beval, text, pt)
48334825
}
48344826

48354827
static void
4836-
delete_tooltip(beval)
4837-
BalloonEval *beval;
4828+
delete_tooltip(BalloonEval *beval)
48384829
{
48394830
PostMessage(beval->balloon, WM_CLOSE, 0, 0);
48404831
}
48414832

48424833
/*ARGSUSED*/
48434834
static VOID CALLBACK
4844-
BevalTimerProc(hwnd, uMsg, idEvent, dwTime)
4845-
HWND hwnd;
4846-
UINT uMsg;
4847-
UINT_PTR idEvent;
4848-
DWORD dwTime;
4835+
BevalTimerProc(
4836+
HWND hwnd,
4837+
UINT uMsg,
4838+
UINT_PTR idEvent,
4839+
DWORD dwTime)
48494840
{
48504841
POINT pt;
48514842
RECT rect;
@@ -4883,8 +4874,7 @@ BevalTimerProc(hwnd, uMsg, idEvent, dwTime)
48834874

48844875
/*ARGSUSED*/
48854876
void
4886-
gui_mch_disable_beval_area(beval)
4887-
BalloonEval *beval;
4877+
gui_mch_disable_beval_area(BalloonEval *beval)
48884878
{
48894879
// TRACE0("gui_mch_disable_beval_area {{{");
48904880
KillTimer(s_textArea, BevalTimerId);
@@ -4893,8 +4883,7 @@ gui_mch_disable_beval_area(beval)
48934883

48944884
/*ARGSUSED*/
48954885
void
4896-
gui_mch_enable_beval_area(beval)
4897-
BalloonEval *beval;
4886+
gui_mch_enable_beval_area(BalloonEval *beval)
48984887
{
48994888
// TRACE0("gui_mch_enable_beval_area |||");
49004889
if (beval == NULL)
@@ -4905,9 +4894,7 @@ gui_mch_enable_beval_area(beval)
49054894
}
49064895

49074896
void
4908-
gui_mch_post_balloon(beval, mesg)
4909-
BalloonEval *beval;
4910-
char_u *mesg;
4897+
gui_mch_post_balloon(BalloonEval *beval, char_u *mesg)
49114898
{
49124899
POINT pt;
49134900
// TRACE0("gui_mch_post_balloon {{{");
@@ -4928,11 +4915,11 @@ gui_mch_post_balloon(beval, mesg)
49284915

49294916
/*ARGSUSED*/
49304917
BalloonEval *
4931-
gui_mch_create_beval_area(target, mesg, mesgCB, clientData)
4932-
void *target; /* ignored, always use s_textArea */
4933-
char_u *mesg;
4934-
void (*mesgCB)(BalloonEval *, int);
4935-
void *clientData;
4918+
gui_mch_create_beval_area(
4919+
void *target, /* ignored, always use s_textArea */
4920+
char_u *mesg,
4921+
void (*mesgCB)(BalloonEval *, int),
4922+
void *clientData)
49364923
{
49374924
/* partially stolen from gui_beval.c */
49384925
BalloonEval *beval;
@@ -5010,8 +4997,7 @@ TrackUserActivity(UINT uMsg)
50104997
}
50114998

50124999
void
5013-
gui_mch_destroy_beval_area(beval)
5014-
BalloonEval *beval;
5000+
gui_mch_destroy_beval_area(BalloonEval *beval)
50155001
{
50165002
vim_free(beval);
50175003
}

src/gui_w48.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ gui_mch_new_colors(void)
11441144
* Set the colors to their default values.
11451145
*/
11461146
void
1147-
gui_mch_def_colors()
1147+
gui_mch_def_colors(void)
11481148
{
11491149
gui.norm_pixel = GetSysColor(COLOR_WINDOWTEXT);
11501150
gui.back_pixel = GetSysColor(COLOR_WINDOW);
@@ -1390,9 +1390,7 @@ gui_mch_get_font(
13901390
*/
13911391
/*ARGSUSED*/
13921392
char_u *
1393-
gui_mch_get_fontname(font, name)
1394-
GuiFont font;
1395-
char_u *name;
1393+
gui_mch_get_fontname(GuiFont font, char_u *name)
13961394
{
13971395
if (name == NULL)
13981396
return NULL;
@@ -2623,8 +2621,7 @@ gui_mch_update_tabline(void)
26232621
* Set the current tab to "nr". First tab is 1.
26242622
*/
26252623
void
2626-
gui_mch_set_curtab(nr)
2627-
int nr;
2624+
gui_mch_set_curtab(int nr)
26282625
{
26292626
if (s_tabhwnd == NULL)
26302627
return;
@@ -3258,7 +3255,7 @@ update_im_font(void)
32583255
* Handler of gui.wide_font (p_guifontwide) changed notification.
32593256
*/
32603257
void
3261-
gui_mch_wide_font_changed()
3258+
gui_mch_wide_font_changed(void)
32623259
{
32633260
# ifndef MSWIN16_FASTTEXT
32643261
LOGFONT lf;
@@ -3385,7 +3382,7 @@ gui_mch_init_font(char_u *font_name, int fontset)
33853382
* Return TRUE if the GUI window is maximized, filling the whole screen.
33863383
*/
33873384
int
3388-
gui_mch_maximized()
3385+
gui_mch_maximized(void)
33893386
{
33903387
WINDOWPLACEMENT wp;
33913388

@@ -3403,7 +3400,7 @@ gui_mch_maximized()
34033400
* new Rows and Columns. This is like resizing the window.
34043401
*/
34053402
void
3406-
gui_mch_newfont()
3403+
gui_mch_newfont(void)
34073404
{
34083405
RECT rect;
34093406

0 commit comments

Comments
 (0)