patch 8.1.0380: "make proto" doesn't work well
Problem: "make proto" doesn't work well.
Solution: Define a few more types for cproto. Update proto files. Fix that
workshop didn't build.
diff --git a/src/proto/digraph.pro b/src/proto/digraph.pro
index dfadc9d..4c12f51 100644
--- a/src/proto/digraph.pro
+++ b/src/proto/digraph.pro
@@ -1,6 +1,6 @@
/* digraph.c */
int do_digraph(int c);
-char_u *get_digraph_for_char(int val);
+char_u *get_digraph_for_char(int val_arg);
int get_digraph(int cmdline);
int getdigraph(int char1, int char2, int meta_char);
void putdigraph(char_u *str);
diff --git a/src/proto/hardcopy.pro b/src/proto/hardcopy.pro
index d2c68ff..4791f4a 100644
--- a/src/proto/hardcopy.pro
+++ b/src/proto/hardcopy.pro
@@ -13,7 +13,7 @@
int mch_print_begin_page(char_u *str);
int mch_print_blank_page(void);
void mch_print_start_line(int margin, int page_line);
-int mch_print_text_out(char_u *p, int len);
+int mch_print_text_out(char_u *textp, int len);
void mch_print_set_font(int iBold, int iItalic, int iUnderline);
void mch_print_set_bg(long_u bgcol);
void mch_print_set_fg(long_u fgcol);
diff --git a/src/proto/option.pro b/src/proto/option.pro
index 22c163d..679329d 100644
--- a/src/proto/option.pro
+++ b/src/proto/option.pro
@@ -64,7 +64,7 @@
int tabstop_padding(colnr_T col, int ts_arg, int *vts);
int tabstop_at(colnr_T col, int ts, int *vts);
colnr_T tabstop_start(colnr_T col, int ts, int *vts);
-void tabstop_fromto(colnr_T start_col, colnr_T end_col, int ts, int *vts, int *ntabs, int *nspcs);
+void tabstop_fromto(colnr_T start_col, colnr_T end_col, int ts_arg, int *vts, int *ntabs, int *nspcs);
int tabstop_eq(int *ts1, int *ts2);
int *tabstop_copy(int *oldts);
int tabstop_count(int *ts);
diff --git a/src/proto/window.pro b/src/proto/window.pro
index c31e599..4527a37 100644
--- a/src/proto/window.pro
+++ b/src/proto/window.pro
@@ -94,5 +94,5 @@
win_T *win_id2wp(typval_T *argvars);
int win_id2win(typval_T *argvars);
void win_findbuf(typval_T *argvars, list_T *list);
-void get_framelayout(frame_T *fr, list_T *l, int topframe);
+void get_framelayout(frame_T *fr, list_T *l, int outer);
/* vim: set ft=c : */