Mercurial > vim
changeset 14736:3e9b24eac417 v8.1.0380
patch 8.1.0380: "make proto" doesn't work well
commit https://github.com/vim/vim/commit/32d19c1820305729c0d1b21536b18bae2d8378ed
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 13 17:26:54 2018 +0200
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 13 Sep 2018 17:30:06 +0200 |
| parents | d8679b4c9074 |
| children | a87b88a11db7 |
| files | src/if_ruby.c src/proto/digraph.pro src/proto/hardcopy.pro src/proto/option.pro src/proto/window.pro src/protodef.h src/version.c src/vim.h src/workshop.c |
| diffstat | 9 files changed, 30 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -11,6 +11,7 @@ * See README.txt for an overview of the Vim source code. */ +#include "protodef.h" #ifdef HAVE_CONFIG_H # include "auto/config.h" #endif
--- 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);
--- a/src/proto/hardcopy.pro +++ b/src/proto/hardcopy.pro @@ -13,7 +13,7 @@ int mch_print_end_page(void); 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);
--- a/src/proto/option.pro +++ b/src/proto/option.pro @@ -64,7 +64,7 @@ int tabstop_set(char_u *var, int **array 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);
--- a/src/proto/window.pro +++ b/src/proto/window.pro @@ -94,5 +94,5 @@ void win_id2tabwin(typval_T *argvars, li 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 : */
new file mode 100644 --- /dev/null +++ b/src/protodef.h @@ -0,0 +1,18 @@ +/* vi:set ts=8 sts=4 sw=4 noet: + * + * VIM - Vi IMproved by Bram Moolenaar + * + * Do ":help uganda" in Vim to read copying and usage conditions. + * Do ":help credits" in Vim to see a list of people who contributed. + */ + +#ifdef PROTO +// cproto runs into trouble when these types are missing +typedef double _Float16; +typedef double _Float32; +typedef double _Float64; +typedef double _Float128; +typedef double _Float32x; +typedef double _Float64x; +#endif +
--- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 380, +/**/ 379, /**/ 378,
--- a/src/vim.h +++ b/src/vim.h @@ -9,10 +9,7 @@ #ifndef VIM__H # define VIM__H -#ifdef PROTO -/* cproto runs into trouble when this type is missing */ -typedef double _Float128; -#endif +#include "protodef.h" /* use fastcall for Borland, when compiling for Win32 */ #if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
--- a/src/workshop.c +++ b/src/workshop.c @@ -8,6 +8,7 @@ * See README.txt for an overview of the Vim source code. */ +#include "protodef.h" #ifdef HAVE_CONFIG_H # include "auto/config.h" #endif @@ -1541,7 +1542,7 @@ workshop_beval_cb( #ifdef FEAT_VARTABS idx = computeIndex(col, text, beval->ts, beval->vts); #else - idx = computeIndex(col, text, beval->ts); + idx = computeIndex(col, text, beval->ts, 0); #endif if (idx > 0) { @@ -1577,11 +1578,8 @@ workshop_beval_cb( computeIndex( int wantedCol, char_u *line, - int ts -#ifdef FEAT_VARTABS - int *vts -#else - ) + int ts, + int *vts UNUSED) { int col = 0; int idx = 0;