diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-10 20:53:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-10 20:53:05 +0200 |
| commit | a6b7a08ae04a3cd4d9c45c906bb7a197e2135179 (patch) | |
| tree | 2adc8f539865a19045daac26adb5de10a4522f88 /src/proto | |
| parent | a357e44ccdf5cfe9f6d35cc348ca33ccd973e1a9 (diff) | |
| download | vim-git-a6b7a08ae04a3cd4d9c45c906bb7a197e2135179.tar.gz | |
patch 7.4.2192v7.4.2192
Problem: Generating prototypes with Cygwin doesn't work well.
Solution: Change #ifdefs. (Ken Takata)
Diffstat (limited to 'src/proto')
| -rw-r--r-- | src/proto/fileio.pro | 2 | ||||
| -rw-r--r-- | src/proto/message.pro | 2 | ||||
| -rw-r--r-- | src/proto/normal.pro | 2 | ||||
| -rw-r--r-- | src/proto/ops.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/proto/fileio.pro b/src/proto/fileio.pro index 5f1bc75d1..748bf4c9b 100644 --- a/src/proto/fileio.pro +++ b/src/proto/fileio.pro @@ -33,7 +33,7 @@ void free_all_autocmds(void); int check_ei(void); char_u *au_event_disable(char *what); void au_event_restore(char_u *old_ei); -void do_autocmd(char_u *arg, int forceit); +void do_autocmd(char_u *arg_in, int forceit); int do_doautocmd(char_u *arg, int do_msg, int *did_something); void ex_doautoall(exarg_T *eap); int check_nomodeline(char_u **argp); diff --git a/src/proto/message.pro b/src/proto/message.pro index 5b7064009..ba8ff37c3 100644 --- a/src/proto/message.pro +++ b/src/proto/message.pro @@ -4,7 +4,7 @@ int verb_msg(char_u *s); int msg_attr(char_u *s, int attr); int msg_attr_keep(char_u *s, int attr, int keep); char_u *msg_strtrunc(char_u *s, int force); -void trunc_string(char_u *s, char_u *buf, int room, int buflen); +void trunc_string(char_u *s, char_u *buf, int room_in, int buflen); void reset_last_sourcing(void); void msg_source(int attr); int emsg_not_now(void); diff --git a/src/proto/normal.pro b/src/proto/normal.pro index 52c7ca5ce..55d12bb29 100644 --- a/src/proto/normal.pro +++ b/src/proto/normal.pro @@ -16,7 +16,7 @@ void push_showcmd(void); void pop_showcmd(void); void do_check_scrollbind(int check); void check_scrollbind(linenr_T topline_diff, long leftcol_diff); -int find_decl(char_u *ptr, int len, int locally, int thisblock, int searchflags); +int find_decl(char_u *ptr, int len, int locally, int thisblock, int flags_arg); void scroll_redraw(int up, long count); void handle_tabmenu(void); void do_nv_ident(int c1, int c2); diff --git a/src/proto/ops.pro b/src/proto/ops.pro index 5a603d004..de4ae7399 100644 --- a/src/proto/ops.pro +++ b/src/proto/ops.pro @@ -47,7 +47,7 @@ void op_addsub(oparg_T *oap, linenr_T Prenum1, int g_cmd); void prepare_viminfo_registers(void); void finish_viminfo_registers(void); int read_viminfo_register(vir_T *virp, int force); -void handle_viminfo_register(garray_T *values, int writing); +void handle_viminfo_register(garray_T *values, int force); void write_viminfo_registers(FILE *fp); void x11_export_final_selection(void); void clip_free_selection(VimClipboard *cbd); |