diff options
82 files changed, 3087 insertions, 3084 deletions
diff --git a/src/Makefile b/src/Makefile index f930834faf..4aa5a48b2b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1361,10 +1361,10 @@ CPP_DEPEND = $(CC) -I$(srcdir) -M$(CPP_MM) \ NO_ATTR= # # Use this for cproto 3 patchlevel 6 or below (use "cproto -V" to check): -# PROTO_FLAGS = -f4 -m__ARGS -d -E"$(CPP)" $(NO_ATTR) +# PROTO_FLAGS = -f4 -d -E"$(CPP)" $(NO_ATTR) # # Use this for cproto 3 patchlevel 7 or above (use "cproto -V" to check): -PROTO_FLAGS = -m -M__ARGS -d -E"$(CPP)" $(NO_ATTR) +PROTO_FLAGS = -d -E"$(CPP)" $(NO_ATTR) ################################################ diff --git a/src/if_ruby.c b/src/if_ruby.c index 8b1590eb94..96d9453dbc 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -189,7 +189,7 @@ static void ruby_vim_init(void); #endif #if defined(DYNAMIC_RUBY) || defined(PROTO) -# ifdef PROTO +# if defined(PROTO) && !defined(HINSTANCE) # define HINSTANCE int /* for generating prototypes */ # endif diff --git a/src/os_win32.c b/src/os_win32.c index b4f5fa4666..da05e6ea3a 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -101,6 +101,7 @@ typedef int CONSOLE_CURSOR_INFO; typedef int COORD; typedef int DWORD; typedef int HANDLE; +typedef int LPHANDLE; typedef int HDC; typedef int HFONT; typedef int HICON; diff --git a/src/proto/blowfish.pro b/src/proto/blowfish.pro index 66d029cd89..d959846105 100644 --- a/src/proto/blowfish.pro +++ b/src/proto/blowfish.pro @@ -1,6 +1,6 @@ /* blowfish.c */ -void crypt_blowfish_encode __ARGS((cryptstate_T *state, char_u *from, size_t len, char_u *to)); -void crypt_blowfish_decode __ARGS((cryptstate_T *state, char_u *from, size_t len, char_u *to)); -void crypt_blowfish_init __ARGS((cryptstate_T *state, char_u *key, char_u *salt, int salt_len, char_u *seed, int seed_len)); -int blowfish_self_test __ARGS((void)); +void crypt_blowfish_encode(cryptstate_T *state, char_u *from, size_t len, char_u *to); +void crypt_blowfish_decode(cryptstate_T *state, char_u *from, size_t len, char_u *to); +void crypt_blowfish_init(cryptstate_T *state, char_u *key, char_u *salt, int salt_len, char_u *seed, int seed_len); +int blowfish_self_test(void); /* vim: set ft=c : */ diff --git a/src/proto/buffer.pro b/src/proto/buffer.pro index 9e97f67e44..71217287a6 100644 --- a/src/proto/buffer.pro +++ b/src/proto/buffer.pro @@ -1,71 +1,71 @@ /* buffer.c */ -int open_buffer __ARGS((int read_stdin, exarg_T *eap, int flags)); -int buf_valid __ARGS((buf_T *buf)); -void close_buffer __ARGS((win_T *win, buf_T *buf, int action, int abort_if_last)); -void buf_clear_file __ARGS((buf_T *buf)); -void buf_freeall __ARGS((buf_T *buf, int flags)); -void goto_buffer __ARGS((exarg_T *eap, int start, int dir, int count)); -void handle_swap_exists __ARGS((buf_T *old_curbuf)); -char_u *do_bufdel __ARGS((int command, char_u *arg, int addr_count, int start_bnr, int end_bnr, int forceit)); -int do_buffer __ARGS((int action, int start, int dir, int count, int forceit)); -void set_curbuf __ARGS((buf_T *buf, int action)); -void enter_buffer __ARGS((buf_T *buf)); -void do_autochdir __ARGS((void)); -buf_T *buflist_new __ARGS((char_u *ffname, char_u *sfname, linenr_T lnum, int flags)); -void free_buf_options __ARGS((buf_T *buf, int free_p_ff)); -int buflist_getfile __ARGS((int n, linenr_T lnum, int options, int forceit)); -void buflist_getfpos __ARGS((void)); -buf_T *buflist_findname_exp __ARGS((char_u *fname)); -buf_T *buflist_findname __ARGS((char_u *ffname)); -int buflist_findpat __ARGS((char_u *pattern, char_u *pattern_end, int unlisted, int diffmode, int curtab_only)); -int ExpandBufnames __ARGS((char_u *pat, int *num_file, char_u ***file, int options)); -buf_T *buflist_findnr __ARGS((int nr)); -char_u *buflist_nr2name __ARGS((int n, int fullname, int helptail)); -void get_winopts __ARGS((buf_T *buf)); -pos_T *buflist_findfpos __ARGS((buf_T *buf)); -linenr_T buflist_findlnum __ARGS((buf_T *buf)); -void buflist_list __ARGS((exarg_T *eap)); -int buflist_name_nr __ARGS((int fnum, char_u **fname, linenr_T *lnum)); -int setfname __ARGS((buf_T *buf, char_u *ffname, char_u *sfname, int message)); -void buf_set_name __ARGS((int fnum, char_u *name)); -void buf_name_changed __ARGS((buf_T *buf)); -buf_T *setaltfname __ARGS((char_u *ffname, char_u *sfname, linenr_T lnum)); -char_u *getaltfname __ARGS((int errmsg)); -int buflist_add __ARGS((char_u *fname, int flags)); -void buflist_slash_adjust __ARGS((void)); -void buflist_altfpos __ARGS((win_T *win)); -int otherfile __ARGS((char_u *ffname)); -void buf_setino __ARGS((buf_T *buf)); -void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate)); -void col_print __ARGS((char_u *buf, size_t buflen, int col, int vcol)); -void maketitle __ARGS((void)); -void resettitle __ARGS((void)); -void free_titles __ARGS((void)); -int build_stl_str_hl __ARGS((win_T *wp, char_u *out, size_t outlen, char_u *fmt, int use_sandbox, int fillchar, int maxwidth, struct stl_hlrec *hltab, struct stl_hlrec *tabtab)); -void get_rel_pos __ARGS((win_T *wp, char_u *buf, int buflen)); -char_u *fix_fname __ARGS((char_u *fname)); -void fname_expand __ARGS((buf_T *buf, char_u **ffname, char_u **sfname)); -char_u *alist_name __ARGS((aentry_T *aep)); -void do_arg_all __ARGS((int count, int forceit, int keep_tabs)); -void ex_buffer_all __ARGS((exarg_T *eap)); -void do_modelines __ARGS((int flags)); -int read_viminfo_bufferlist __ARGS((vir_T *virp, int writing)); -void write_viminfo_bufferlist __ARGS((FILE *fp)); -char_u *buf_spname __ARGS((buf_T *buf)); -int find_win_for_buf __ARGS((buf_T *buf, win_T **wp, tabpage_T **tp)); -void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr)); -linenr_T buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr)); -int buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type)); -linenr_T buf_delsign __ARGS((buf_T *buf, int id)); -int buf_findsign __ARGS((buf_T *buf, int id)); -int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum)); -int buf_findsigntype_id __ARGS((buf_T *buf, linenr_T lnum, int typenr)); -int buf_signcount __ARGS((buf_T *buf, linenr_T lnum)); -void buf_delete_signs __ARGS((buf_T *buf)); -void buf_delete_all_signs __ARGS((void)); -void sign_list_placed __ARGS((buf_T *rbuf)); -void sign_mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount, long amount_after)); -void set_buflisted __ARGS((int on)); -int buf_contents_changed __ARGS((buf_T *buf)); -void wipe_buffer __ARGS((buf_T *buf, int aucmd)); +int open_buffer(int read_stdin, exarg_T *eap, int flags); +int buf_valid(buf_T *buf); +void close_buffer(win_T *win, buf_T *buf, int action, int abort_if_last); +void buf_clear_file(buf_T *buf); +void buf_freeall(buf_T *buf, int flags); +void goto_buffer(exarg_T *eap, int start, int dir, int count); +void handle_swap_exists(buf_T *old_curbuf); +char_u *do_bufdel(int command, char_u *arg, int addr_count, int start_bnr, int end_bnr, int forceit); +int do_buffer(int action, int start, int dir, int count, int forceit); +void set_curbuf(buf_T *buf, int action); +void enter_buffer(buf_T *buf); +void do_autochdir(void); +buf_T *buflist_new(char_u *ffname, char_u *sfname, linenr_T lnum, int flags); +void free_buf_options(buf_T *buf, int free_p_ff); +int buflist_getfile(int n, linenr_T lnum, int options, int forceit); +void buflist_getfpos(void); +buf_T *buflist_findname_exp(char_u *fname); +buf_T *buflist_findname(char_u *ffname); +int buflist_findpat(char_u *pattern, char_u *pattern_end, int unlisted, int diffmode, int curtab_only); +int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options); +buf_T *buflist_findnr(int nr); +char_u *buflist_nr2name(int n, int fullname, int helptail); +void get_winopts(buf_T *buf); +pos_T *buflist_findfpos(buf_T *buf); +linenr_T buflist_findlnum(buf_T *buf); +void buflist_list(exarg_T *eap); +int buflist_name_nr(int fnum, char_u **fname, linenr_T *lnum); +int setfname(buf_T *buf, char_u *ffname, char_u *sfname, int message); +void buf_set_name(int fnum, char_u *name); +void buf_name_changed(buf_T *buf); +buf_T *setaltfname(char_u *ffname, char_u *sfname, linenr_T lnum); +char_u *getaltfname(int errmsg); +int buflist_add(char_u *fname, int flags); +void buflist_slash_adjust(void); +void buflist_altfpos(win_T *win); +int otherfile(char_u *ffname); +void buf_setino(buf_T *buf); +void fileinfo(int fullname, int shorthelp, int dont_truncate); +void col_print(char_u *buf, size_t buflen, int col, int vcol); +void maketitle(void); +void resettitle(void); +void free_titles(void); +int build_stl_str_hl(win_T *wp, char_u *out, size_t outlen, char_u *fmt, int use_sandbox, int fillchar, int maxwidth, struct stl_hlrec *hltab, struct stl_hlrec *tabtab); +void get_rel_pos(win_T *wp, char_u *buf, int buflen); +char_u *fix_fname(char_u *fname); +void fname_expand(buf_T *buf, char_u **ffname, char_u **sfname); +char_u *alist_name(aentry_T *aep); +void do_arg_all(int count, int forceit, int keep_tabs); +void ex_buffer_all(exarg_T *eap); +void do_modelines(int flags); +int read_viminfo_bufferlist(vir_T *virp, int writing); +void write_viminfo_bufferlist(FILE *fp); +char_u *buf_spname(buf_T *buf); +int find_win_for_buf(buf_T *buf, win_T **wp, tabpage_T **tp); +void buf_addsign(buf_T *buf, int id, linenr_T lnum, int typenr); +linenr_T buf_change_sign_type(buf_T *buf, int markId, int typenr); +int buf_getsigntype(buf_T *buf, linenr_T lnum, int type); +linenr_T buf_delsign(buf_T *buf, int id); +int buf_findsign(buf_T *buf, int id); +int buf_findsign_id(buf_T *buf, linenr_T lnum); +int buf_findsigntype_id(buf_T *buf, linenr_T lnum, int typenr); +int buf_signcount(buf_T *buf, linenr_T lnum); +void buf_delete_signs(buf_T *buf); +void buf_delete_all_signs(void); +void sign_list_placed(buf_T *rbuf); +void sign_mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after); +void set_buflisted(int on); +int buf_contents_changed(buf_T *buf); +void wipe_buffer(buf_T *buf, int aucmd); /* vim: set ft=c : */ diff --git a/src/proto/charset.pro b/src/proto/charset.pro index 22e43cd7aa..7b4961d704 100644 --- a/src/proto/charset.pro +++ b/src/proto/charset.pro @@ -1,62 +1,62 @@ /* charset.c */ -int init_chartab __ARGS((void)); -int buf_init_chartab __ARGS((buf_T *buf, int global)); -void trans_characters __ARGS((char_u *buf, int bufsize)); -char_u *transstr __ARGS((char_u *s)); -char_u *str_foldcase __ARGS((char_u *str, int orglen, char_u *buf, int buflen)); -char_u *transchar __ARGS((int c)); -char_u *transchar_byte __ARGS((int c)); -void transchar_nonprint __ARGS((char_u *buf, int c)); -void transchar_hex __ARGS((char_u *buf, int c)); -int byte2cells __ARGS((int b)); -int char2cells __ARGS((int c)); -int ptr2cells __ARGS((char_u *p)); -int vim_strsize __ARGS((char_u *s)); -int vim_strnsize __ARGS((char_u *s, int len)); -int chartabsize __ARGS((char_u *p, colnr_T col)); -int linetabsize __ARGS((char_u *s)); -int linetabsize_col __ARGS((int startcol, char_u *s)); -int win_linetabsize __ARGS((win_T *wp, char_u *line, colnr_T len)); -int vim_isIDc __ARGS((int c)); -int vim_iswordc __ARGS((int c)); -int vim_iswordc_buf __ARGS((int c, buf_T *buf)); -int vim_iswordp __ARGS((char_u *p)); -int vim_iswordp_buf __ARGS((char_u *p, buf_T *buf)); -int vim_isfilec __ARGS((int c)); -int vim_isfilec_or_wc __ARGS((int c)); -int vim_isprintc __ARGS((int c)); -int vim_isprintc_strict __ARGS((int c)); -int lbr_chartabsize __ARGS((char_u *line, unsigned char *s, colnr_T col)); -int lbr_chartabsize_adv __ARGS((char_u *line, char_u **s, colnr_T col)); -int win_lbr_chartabsize __ARGS((win_T *wp, char_u *line, char_u *s, colnr_T col, int *headp)); -int in_win_border __ARGS((win_T *wp, colnr_T vcol)); -void getvcol __ARGS((win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end)); -colnr_T getvcol_nolist __ARGS((pos_T *posp)); -void getvvcol __ARGS((win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end)); -void getvcols __ARGS((win_T *wp, pos_T *pos1, pos_T *pos2, colnr_T *left, colnr_T *right)); -char_u *skipwhite __ARGS((char_u *q)); -char_u *skipdigits __ARGS((char_u *q)); -char_u *skipbin __ARGS((char_u *q)); -char_u *skiphex __ARGS((char_u *q)); -char_u *skiptobin __ARGS((char_u *q)); -char_u *skiptodigit __ARGS((char_u *q)); -char_u *skiptohex __ARGS((char_u *q)); -int vim_isdigit __ARGS((int c)); -int vim_isxdigit __ARGS((int c)); -int vim_isbdigit __ARGS((int c)); -int vim_islower __ARGS((int c)); -int vim_isupper __ARGS((int c)); -int vim_toupper __ARGS((int c)); -int vim_tolower __ARGS((int c)); -char_u *skiptowhite __ARGS((char_u *p)); -char_u *skiptowhite_esc __ARGS((char_u *p)); -long getdigits __ARGS((char_u **pp)); -int vim_isblankline __ARGS((char_u *lbuf)); -void vim_str2nr __ARGS((char_u *start, int *prep, int *len, int what, long *nptr, unsigned long *unptr, int maxlen)); -int hex2nr __ARGS((int c)); -int hexhex2nr __ARGS((char_u *p)); -int rem_backslash __ARGS((char_u *str)); -void backslash_halve __ARGS((char_u *p)); -char_u *backslash_halve_save __ARGS((char_u *p)); -void ebcdic2ascii __ARGS((char_u *buffer, int len)); +int init_chartab(void); +int buf_init_chartab(buf_T *buf, int global); +void trans_characters(char_u *buf, int bufsize); +char_u *transstr(char_u *s); +char_u *str_foldcase(char_u *str, int orglen, char_u *buf, int buflen); +char_u *transchar(int c); +char_u *transchar_byte(int c); +void transchar_nonprint(char_u *buf, int c); +void transchar_hex(char_u *buf, int c); +int byte2cells(int b); +int char2cells(int c); +int ptr2cells(char_u *p); +int vim_strsize(char_u *s); +int vim_strnsize(char_u *s, int len); +int chartabsize(char_u *p, colnr_T col); +int linetabsize(char_u *s); +int linetabsize_col(int startcol, char_u *s); +int win_linetabsize(win_T *wp, char_u *line, colnr_T len); +int vim_isIDc(int c); +int vim_iswordc(int c); +int vim_iswordc_buf(int c, buf_T *buf); +int vim_iswordp(char_u *p); +int vim_iswordp_buf(char_u *p, buf_T *buf); +int vim_isfilec(int c); +int vim_isfilec_or_wc(int c); +int vim_isprintc(int c); +int vim_isprintc_strict(int c); +int lbr_chartabsize(char_u *line, unsigned char *s, colnr_T col); +int lbr_chartabsize_adv(char_u *line, char_u **s, colnr_T col); +int win_lbr_chartabsize(win_T *wp, char_u *line, char_u *s, colnr_T col, int *headp); +int in_win_border(win_T *wp, colnr_T vcol); +void getvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end); +colnr_T getvcol_nolist(pos_T *posp); +void getvvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end); +void getvcols(win_T *wp, pos_T *pos1, pos_T *pos2, colnr_T *left, colnr_T *right); +char_u *skipwhite(char_u *q); +char_u *skipdigits(char_u *q); +char_u *skipbin(char_u *q); +char_u *skiphex(char_u *q); +char_u *skiptobin(char_u *q); +char_u *skiptodigit(char_u *q); +char_u *skiptohex(char_u *q); +int vim_isdigit(int c); +int vim_isxdigit(int c); +int vim_isbdigit(int c); +int vim_islower(int c); +int vim_isupper(int c); +int vim_toupper(int c); +int vim_tolower(int c); +char_u *skiptowhite(char_u *p); +char_u *skiptowhite_esc(char_u *p); +long getdigits(char_u **pp); +int vim_isblankline(char_u *lbuf); +void vim_str2nr(char_u *start, int *prep, int *len, int what, long *nptr, unsigned long *unptr, int maxlen); +int hex2nr(int c); +int hexhex2nr(char_u *p); +int rem_backslash(char_u *str); +void backslash_halve(char_u *p); +char_u *backslash_halve_save(char_u *p); +void ebcdic2ascii(char_u *buffer, int len); /* vim: set ft=c : */ diff --git a/src/proto/crypt.pro b/src/proto/crypt.pro index 7b29026a1d..c944b45cef 100644 --- a/src/proto/crypt.pro +++ b/src/proto/crypt.pro @@ -1,26 +1,26 @@ /* crypt.c */ -int crypt_method_nr_from_name __ARGS((char_u *name)); -int crypt_method_nr_from_magic __ARGS((char *ptr, int len)); -int crypt_works_inplace __ARGS((cryptstate_T *state)); -int crypt_get_method_nr __ARGS((buf_T *buf)); -int crypt_whole_undofile __ARGS((int method_nr)); -int crypt_get_header_len __ARGS((int method_nr)); -void crypt_set_cm_option __ARGS((buf_T *buf, int method_nr)); -int crypt_self_test __ARGS((void)); -cryptstate_T *crypt_create __ARGS((int method_nr, char_u *key, char_u *salt, int salt_len, char_u *seed, int seed_len)); -cryptstate_T *crypt_create_from_header __ARGS((int method_nr, char_u *key, char_u *header)); -cryptstate_T *crypt_create_from_file __ARGS((FILE *fp, char_u *key)); -cryptstate_T *crypt_create_for_writing __ARGS((int method_nr, char_u *key, char_u **header, int *header_len)); -void crypt_free_state __ARGS((cryptstate_T *state)); -long crypt_encode_alloc __ARGS((cryptstate_T *state, char_u *from, size_t len, char_u **newptr)); -long crypt_decode_alloc __ARGS((cryptstate_T *state, char_u *ptr, long len, char_u **newptr)); -void crypt_encode __ARGS((cryptstate_T *state, char_u *from, size_t len, char_u *to)); -void crypt_decode __ARGS((cryptstate_T *state, char_u *from, size_t len, char_u *to)); -void crypt_encode_inplace __ARGS((cryptstate_T *state, char_u *buf, size_t len)); -void crypt_decode_inplace __ARGS((cryptstate_T *state, char_u *buf, size_t len)); -void crypt_free_key __ARGS((char_u *key)); -void crypt_check_method __ARGS((int method)); -void crypt_check_current_method __ARGS((void)); -char_u *crypt_get_key __ARGS((int store, int twice)); -void crypt_append_msg __ARGS((buf_T *buf)); +int crypt_method_nr_from_name(char_u *name); +int crypt_method_nr_from_magic(char *ptr, int len); +int crypt_works_inplace(cryptstate_T *state); +int crypt_get_method_nr(buf_T *buf); +int crypt_whole_undofile(int method_nr); +int crypt_get_header_len(int method_nr); +void crypt_set_cm_option(buf_T *buf, int method_nr); +int crypt_self_test(void); +cryptstate_T *crypt_create(int method_nr, char_u *key, char_u *salt, int salt_len, char_u *seed, int seed_len); +cryptstate_T *crypt_create_from_header(int method_nr, char_u *key, char_u *header); +cryptstate_T *crypt_create_from_file(FILE *fp, char_u *key); +cryptstate_T *crypt_create_for_writing(int method_nr, char_u *key, char_u **header, in |