Mercurial > vim
changeset 1879:e8eeeff19eae v7.2.176
updated for version 7.2-176
| author | vimboss |
|---|---|
| date | Sat, 16 May 2009 14:41:10 +0000 |
| parents | 6ed4a82fcfc6 |
| children | e5602d92da8c |
| files | src/edit.c src/ex_cmds.c src/ex_docmd.c src/os_unix.c src/os_unix.h src/structs.h src/term.h src/version.c |
| diffstat | 8 files changed, 6 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -69,11 +69,7 @@ struct compl_S compl_T *cp_prev; char_u *cp_str; /* matched text */ char cp_icase; /* TRUE or FALSE: ignore case */ -#ifdef S_SPLINT_S /* splint can't handle array of pointers */ - char_u **cp_text; /* text for the menu */ -#else char_u *(cp_text[CPT_COUNT]); /* text for the menu */ -#endif char_u *cp_fname; /* file containing the match, allocated when * cp_flags has FREE_FNAME */ int cp_flags; /* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */ @@ -3835,11 +3831,7 @@ ins_compl_add_tv(tv, dir) char_u *word; int icase = FALSE; int adup = FALSE; -#ifdef S_SPLINT_S /* splint doesn't parse array of pointers correctly */ - char_u **cptext; -#else char_u *(cptext[CPT_COUNT]); -#endif if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL) {
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -5776,10 +5776,6 @@ find_help_tags(arg, num_matches, matches { char_u *s, *d; int i; -#ifdef S_SPLINT_S /* splint doesn't understand array of pointers */ - static char **mtable; - static char **rtable; -#else static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*", "/*", "/\\*", "\"*", "**", "/\\(\\)", @@ -5794,7 +5790,6 @@ find_help_tags(arg, num_matches, matches "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=", "\\[count]", "\\[quotex]", "\\[range]", "\\[pattern]", "\\\\bar", "/\\\\%\\$"}; -#endif int flags; d = IObuff; /* assume IObuff is long enough! */
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -9395,13 +9395,7 @@ find_cmdline_var(src, usedlen) { int len; int i; -#ifdef S_SPLINT_S /* splint can't handle array of pointers */ - static char **spec_str; - static char *(nospec_str[]) -#else - static char *(spec_str[]) -#endif - = { + static char *(spec_str[]) = { "%", #define SPEC_PERC 0 "#",
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -199,9 +199,7 @@ static int save_patterns __ARGS((int num #endif #ifndef SIG_ERR -# ifndef S_SPLINT_S -# define SIG_ERR ((RETSIGTYPE (*)())-1) -# endif +# define SIG_ERR ((RETSIGTYPE (*)())-1) #endif /* volatile because it is used in signal handler sig_winch(). */ @@ -443,9 +441,7 @@ mch_char_avail() #if defined(HAVE_TOTAL_MEM) || defined(PROTO) # ifdef HAVE_SYS_RESOURCE_H -# ifndef S_SPLINT_S /* splint crashes on bits/resource.h */ -# include <sys/resource.h> -# endif +# include <sys/resource.h> # endif # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL) # include <sys/sysctl.h>
--- a/src/os_unix.h +++ b/src/os_unix.h @@ -53,9 +53,7 @@ #endif #ifdef HAVE_UNISTD_H -# ifndef S_SPLINT_S /* splint crashes on bits/confname.h */ -# include <unistd.h> -# endif +# include <unistd.h> #endif #ifdef HAVE_LIBC_H
--- a/src/structs.h +++ b/src/structs.h @@ -1646,11 +1646,7 @@ struct tabpage_S #endif #ifdef FEAT_DIFF diff_T *tp_first_diff; -# ifdef S_SPLINT_S /* splint doesn't understand the array of pointers */ - buf_T **tp_diffbuf; -# else buf_T *(tp_diffbuf[DB_COUNT]); -# endif int tp_diff_invalid; /* list of diffs is outdated */ #endif frame_T *tp_snapshot; /* window layout snapshot */
--- a/src/term.h +++ b/src/term.h @@ -96,11 +96,7 @@ enum SpecialKey * - there should be code in term.c to obtain the value from the termcap */ -#ifdef S_SPLINT_S /* splint doesn't understand array of pointers */ -extern char_u **term_strings; /* current terminal strings */ -#else extern char_u *(term_strings[]); /* current terminal strings */ -#endif /* * strings used for terminal