To: vim_dev@googlegroups.com Subject: Patch 7.4.2192 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2192 Problem: Generating prototypes with Cygwin doesn't work well. Solution: Change #ifdefs. (Ken Takata) Files: src/gui.h, src/gui_w32.c, src/ops.c, src/proto/fileio.pro, src/proto/message.pro, src/proto/normal.pro, src/proto/ops.pro, src/vim.h *** ../vim-7.4.2191/src/gui.h 2016-07-21 22:10:06.043248466 +0200 --- src/gui.h 2016-08-10 20:47:29.178138841 +0200 *************** *** 16,22 **** # include #endif ! #ifdef FEAT_BEVAL # include "gui_beval.h" #endif --- 16,22 ---- # include #endif ! #if defined(FEAT_BEVAL) || defined(PROTO) # include "gui_beval.h" #endif *** ../vim-7.4.2191/src/gui_w32.c 2016-07-07 16:42:57.318788362 +0200 --- src/gui_w32.c 2016-08-10 20:47:29.182138804 +0200 *************** *** 247,252 **** --- 247,253 ---- # define CONST # define FAR # define NEAR + # undef _cdecl # define _cdecl typedef int BOOL; typedef int BYTE; *************** *** 288,293 **** --- 289,295 ---- typedef int LPNMHDR; typedef int LONG; typedef int WNDPROC; + typedef int UINT_PTR; #endif #ifndef GET_X_LPARAM *************** *** 3451,3457 **** set_window_title(s_hwnd, (title == NULL ? "VIM" : (char *)title)); } ! #ifdef FEAT_MOUSESHAPE /* Table for shape IDCs. Keep in sync with the mshape_names[] table in * misc2.c! */ static LPCSTR mshape_idcs[] = --- 3453,3459 ---- set_window_title(s_hwnd, (title == NULL ? "VIM" : (char *)title)); } ! #if defined(FEAT_MOUSESHAPE) || defined(PROTO) /* Table for shape IDCs. Keep in sync with the mshape_names[] table in * misc2.c! */ static LPCSTR mshape_idcs[] = *************** *** 3514,3520 **** } #endif ! #ifdef FEAT_BROWSE /* * The file browser exists in two versions: with "W" uses wide characters, * without "W" the current codepage. When FEAT_MBYTE is defined and on --- 3516,3522 ---- } #endif ! #if defined(FEAT_BROWSE) || defined(PROTO) /* * The file browser exists in two versions: with "W" uses wide characters, * without "W" the current codepage. When FEAT_MBYTE is defined and on *** ../vim-7.4.2191/src/ops.c 2016-07-01 18:16:47.497936191 +0200 --- src/ops.c 2016-08-10 20:47:29.182138804 +0200 *************** *** 6283,6289 **** * 'permanent' of the two), otherwise the PRIMARY one. * For now, use a hard-coded sanity limit of 1Mb of data. */ ! #if defined(FEAT_X11) && defined(FEAT_CLIPBOARD) void x11_export_final_selection(void) { --- 6283,6289 ---- * 'permanent' of the two), otherwise the PRIMARY one. * For now, use a hard-coded sanity limit of 1Mb of data. */ ! #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) void x11_export_final_selection(void) { *** ../vim-7.4.2191/src/proto/fileio.pro 2016-07-01 17:17:13.294266702 +0200 --- src/proto/fileio.pro 2016-08-10 20:47:29.182138804 +0200 *************** *** 33,39 **** 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); int do_doautocmd(char_u *arg, int do_msg, int *did_something); void ex_doautoall(exarg_T *eap); int check_nomodeline(char_u **argp); --- 33,39 ---- 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_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); *** ../vim-7.4.2191/src/proto/message.pro 2016-07-20 00:10:44.484250033 +0200 --- src/proto/message.pro 2016-08-10 20:47:29.182138804 +0200 *************** *** 4,10 **** 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 reset_last_sourcing(void); void msg_source(int attr); int emsg_not_now(void); --- 4,10 ---- 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_in, int buflen); void reset_last_sourcing(void); void msg_source(int attr); int emsg_not_now(void); *** ../vim-7.4.2191/src/proto/normal.pro 2016-01-19 13:21:55.845334290 +0100 --- src/proto/normal.pro 2016-08-10 20:47:29.182138804 +0200 *************** *** 16,22 **** 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); void scroll_redraw(int up, long count); void handle_tabmenu(void); void do_nv_ident(int c1, int c2); --- 16,22 ---- 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 flags_arg); void scroll_redraw(int up, long count); void handle_tabmenu(void); void do_nv_ident(int c1, int c2); *** ../vim-7.4.2191/src/proto/ops.pro 2016-06-11 21:04:34.927761279 +0200 --- src/proto/ops.pro 2016-08-10 20:47:29.182138804 +0200 *************** *** 47,53 **** 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 write_viminfo_registers(FILE *fp); void x11_export_final_selection(void); void clip_free_selection(VimClipboard *cbd); --- 47,53 ---- 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 force); void write_viminfo_registers(FILE *fp); void x11_export_final_selection(void); void clip_free_selection(VimClipboard *cbd); *** ../vim-7.4.2191/src/vim.h 2016-08-10 20:45:04.379456331 +0200 --- src/vim.h 2016-08-10 20:47:29.182138804 +0200 *************** *** 2109,2115 **** * been seen at that stage. But it must be before globals.h, where error_ga * is declared. */ #if !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_X11) \ ! && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC) # define mch_errmsg(str) fprintf(stderr, "%s", (str)) # define display_errors() fflush(stderr) # define mch_msg(str) printf("%s", (str)) --- 2109,2115 ---- * been seen at that stage. But it must be before globals.h, where error_ga * is declared. */ #if !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_X11) \ ! && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC) && !defined(PROTO) # define mch_errmsg(str) fprintf(stderr, "%s", (str)) # define display_errors() fflush(stderr) # define mch_msg(str) printf("%s", (str)) *** ../vim-7.4.2191/src/version.c 2016-08-10 20:45:04.379456331 +0200 --- src/version.c 2016-08-10 20:48:42.133475312 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2192, /**/ -- The process for understanding customers primarily involves sitting around with other marketing people and talking about what you would to if you were dumb enough to be a customer. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///