Mercurial > vim
changeset 16354:b3bc3ba07bef v8.1.1182
patch 8.1.1182: some function prototypes are outdated
commit https://github.com/vim/vim/commit/b9cdb37176a163f5047e149c3b568eee9883157c
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Apr 17 18:24:35 2019 +0200
patch 8.1.1182: some function prototypes are outdated
Problem: Some function prototypes are outdated.
Solution: Update function prototypes. (Ken Takata, closes https://github.com/vim/vim/issues/4267)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 17 Apr 2019 18:30:05 +0200 |
| parents | e0266f56b5e8 |
| children | 1964349f162c |
| files | src/os_mswin.c src/proto/ex_getln.pro src/proto/gui_w32.pro src/proto/terminal.pro src/proto/window.pro src/terminal.c src/version.c src/window.c |
| diffstat | 8 files changed, 21 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -98,8 +98,10 @@ typedef int LPARAM; typedef int LPBOOL; typedef int LPCSTR; typedef int LPCWSTR; +typedef int LPDWORD; typedef int LPSTR; typedef int LPTSTR; +typedef int LPVOID; typedef int LPWSTR; typedef int LRESULT; typedef int MOUSE_EVENT_RECORD; @@ -1733,7 +1735,7 @@ typedef BOOL (WINAPI *pfnGetVolumeInform DWORD nFileSystemNameSize); static pfnGetVolumeInformationByHandleW pGetVolumeInformationByHandleW = NULL; - char_u * + static char_u * resolve_reparse_point(char_u *fname) { HANDLE h = INVALID_HANDLE_VALUE;
--- a/src/proto/ex_getln.pro +++ b/src/proto/ex_getln.pro @@ -54,7 +54,5 @@ int read_viminfo_history(vir_T *virp, in void handle_viminfo_history(garray_T *values, int writing); void finish_viminfo_history(vir_T *virp); void write_viminfo_history(FILE *fp, int merge); -void cmd_pchar(int c, int offset); -int cmd_gchar(int offset); char_u *script_get(exarg_T *eap, char_u *cmd); /* vim: set ft=c : */
--- a/src/proto/gui_w32.pro +++ b/src/proto/gui_w32.pro @@ -60,7 +60,6 @@ void gui_mch_settitle(char_u *title, cha void mch_set_mouse_shape(int shape); char_u *gui_mch_browse(int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter); char_u *gui_mch_browsedir(char_u *title, char_u *initdir); -int get_cmd_args(char *prog, char *cmdline, char ***argvp, char **tofree); void gui_mch_set_parent(char *title); void gui_mch_prepare(int *argc, char **argv); int gui_mch_init(void);
--- a/src/proto/terminal.pro +++ b/src/proto/terminal.pro @@ -56,7 +56,7 @@ void f_term_start(typval_T *argvars, typ void f_term_wait(typval_T *argvars, typval_T *rettv); void term_send_eof(channel_T *ch); job_T *term_getjob(term_T *term); -int terminal_enabled(void); void term_free_conpty(term_T *term); int use_conpty(void); +int terminal_enabled(void); /* vim: set ft=c : */
--- a/src/proto/window.pro +++ b/src/proto/window.pro @@ -38,7 +38,7 @@ void win_goto(win_T *wp); win_T *win_find_nr(int winnr); tabpage_T *win_find_tabpage(win_T *win); win_T *win_vert_neighbor(tabpage_T *tp, win_T *wp, int up, long count); -win_T *win_horz_neighbor(tabpage_T *tp, win_T * wp, int left, long count); +win_T *win_horz_neighbor(tabpage_T *tp, win_T *wp, int left, long count); void win_enter(win_T *wp, int undo_sync); win_T *buf_jump_open_win(buf_T *buf); win_T *buf_jump_open_tab(buf_T *buf);
--- a/src/terminal.c +++ b/src/terminal.c @@ -5663,6 +5663,19 @@ term_getjob(term_T *term) /************************************** * 2. MS-Windows implementation. */ +#ifdef PROTO +typedef int COORD; +typedef int DWORD; +typedef int HANDLE; +typedef int *DWORD_PTR; +typedef int HPCON; +typedef int HRESULT; +typedef int LPPROC_THREAD_ATTRIBUTE_LIST; +typedef int PSIZE_T; +typedef int PVOID; +typedef int SIZE_T; +typedef int WINAPI; +#endif HRESULT (WINAPI *pCreatePseudoConsole)(COORD, HANDLE, HANDLE, DWORD, HPCON*); HRESULT (WINAPI *pResizePseudoConsole)(HPCON, COORD);
--- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1182, +/**/ 1181, /**/ 1180,
--- a/src/window.c +++ b/src/window.c @@ -4302,7 +4302,7 @@ win_goto_ver( * Returns the specified window if the neighbor is not found. */ win_T * -win_horz_neighbor(tabpage_T *tp, win_T * wp, int left, long count) +win_horz_neighbor(tabpage_T *tp, win_T *wp, int left, long count) { frame_T *fr; frame_T *nfr;