Fix compilation problems caused by patch 7.3.102

b4winckler · Jan 29, 2011 · 20ded53 · 20ded53
1 parent 5e544c5
commit 20ded53
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m
@@ -1431,7 +1431,8 @@
     char_u	*message,
     char_u	*buttons,
     int		dfltbutton,
-    char_u	*textfield)
+    char_u	*textfield,
+    int         ex_cmd)     // UNUSED
 {
     ASLogDebug(@"type=%d title='%s' message='%s' buttons='%s' dfltbutton=%d "
                "textfield='%s'", type, title, message, buttons, dfltbutton,

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
@@ -1501,7 +1501,7 @@ vim_dialog_save_changes(buf)
 		(buf->b_fname != NULL)
 		    ? (char_u *)_("&Save\n&Cancel\n&Don't Save")
 		    : (char_u *)_("&Save...\n&Cancel\n&Don't Save"),
-		1, NULL))
+		1, NULL, FALSE))
     {
 	case 1: return VIM_YES;
 	case 3: return VIM_NO;
@@ -1528,7 +1528,7 @@ vim_dialog_save_all_changes(buf)
 			    "them."),
 		(char_u *)_("&Save\n&Don't Save\nS&ave All\nD&iscard All\n"
 			    "&Cancel"),
-		1, NULL))
+		1, NULL, FALSE))
     {
 	case 1: return VIM_YES;
 	case 2: return VIM_NO;

diff --git a/src/fileio.c b/src/fileio.c
@@ -7031,7 +7031,7 @@ buf_check_timestamp(buf, focus)
 		{
 		    switch (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
 					(char_u *)_("&OK\n&Load File\nLoad &All\n&Ignore All"),
-								    1, NULL))
+								1, NULL, TRUE))
 		    {
 			case 3:
 			    default_reload_choice = 2;

diff --git a/src/proto/gui_macvim.pro b/src/proto/gui_macvim.pro
@@ -105,7 +105,8 @@ gui_mch_dialog(
     char_u	*message,
     char_u	*buttons,
     int		dfltbutton,
-    char_u	*textfield);
+    char_u	*textfield,
+    int         ex_cmd);
     void
 gui_mch_draw_hollow_cursor(guicolor_T color);
     void