Skip to content

Commit ad04495

Browse files
authored
Merge pull request #1429 from ychin/gui_macvim_warnings_fix
Fix gui_macvim.m compiler warnings
2 parents ef2cacd + f1be7fd commit ad04495

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/MacVim/gui_macvim.m

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,8 +1007,7 @@
10071007
* If a font is not going to be used, free its structure.
10081008
*/
10091009
void
1010-
gui_mch_free_font(font)
1011-
GuiFont font;
1010+
gui_mch_free_font(GuiFont font)
10121011
{
10131012
if (font != NOFONT) {
10141013
ASLogDebug(@"font=%p", font);
@@ -1494,8 +1493,7 @@
14941493

14951494

14961495
void
1497-
ex_macaction(eap)
1498-
exarg_T *eap;
1496+
ex_macaction(exarg_T *eap)
14991497
{
15001498
if (!gui.in_use) {
15011499
emsg(_("E9000-M: Command only available in GUI mode"));
@@ -2616,7 +2614,12 @@ void f_showdefinition(typval_T *argvars, typval_T *rettv UNUSED)
26162614
// just pass the output of screenpos() directly into the 2nd argument).
26172615
varnumber_T lnum = 0, col = 0;
26182616
{
2619-
typval_T args[1] = { {VAR_UNKNOWN} };
2617+
typval_T arg_winid_unknown;
2618+
init_tv(&arg_winid_unknown);
2619+
arg_winid_unknown.v_type = VAR_UNKNOWN;
2620+
2621+
typval_T args[1] = { arg_winid_unknown };
2622+
26202623
typval_T lrettv;
26212624

26222625
f_getcurpos(args, &lrettv);
@@ -2628,22 +2631,24 @@ void f_showdefinition(typval_T *argvars, typval_T *rettv UNUSED)
26282631
}
26292632
{
26302633
typval_T arg_winid;
2634+
init_tv(&arg_winid);
26312635
arg_winid.v_type = VAR_NUMBER;
26322636
arg_winid.vval.v_number = curwin->w_id;
26332637

26342638
typval_T arg_lnum;
2639+
init_tv(&arg_lnum);
26352640
arg_lnum.v_type = VAR_NUMBER;
26362641
arg_lnum.vval.v_number = lnum;
26372642

26382643
typval_T arg_col;
2644+
init_tv(&arg_col);
26392645
arg_col.v_type = VAR_NUMBER;
26402646
arg_col.vval.v_number = col;
26412647

2642-
typval_T args[4] = {
2648+
typval_T args[3] = {
26432649
arg_winid,
26442650
arg_lnum,
26452651
arg_col,
2646-
{VAR_UNKNOWN}
26472652
};
26482653
typval_T lrettv;
26492654

0 commit comments

Comments
 (0)