updated for version 7.2-176

diff --git a/src/edit.c b/src/edit.c
index ee30a3e30dcdf10a70970929716b953957267a55..4cb727cdc8d3b465b36f47c0b2c68aa344d04712 100644 (file)
--- 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)
     {

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 8a0a9ec128e9c354d3ac3d50d4b74152b8c09695..a132963c1ecbcfd5ac8de67ad6a9338a9ea73de8 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5776,10 +5776,6 @@ find_help_tags(arg, num_matches, matches, keep_lang)
 {
     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, keep_lang)
                               "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
                               "\\[count]", "\\[quotex]", "\\[range]",
                               "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
-#endif
     int flags;
 
     d = IObuff;                    /* assume IObuff is long enough! */

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 15ec54cca013dabcb0e3cf310e12203acf8e2808..1c4ec59218782df696ce6d075f633ccbbb2c4151 100644 (file)
--- 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
                    "#",

diff --git a/src/os_unix.c b/src/os_unix.c
index 88b3a65445ab0c54d34a56c9e66d207485ef79d3..4b0f8735972584234b2f1ac50258943366d8d0fc 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -199,9 +199,7 @@ static int save_patterns __ARGS((int num_pat, char_u **pat, int *num_file, char_
 #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>

diff --git a/src/os_unix.h b/src/os_unix.h
index dd70939dcaecfa53dd642512288162236d6069d2..944cc1b8384b6a8708f370f0e760d81bfa370c5d 100644 (file)
--- 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

diff --git a/src/structs.h b/src/structs.h
index 25012d698adbe9b9eeffb29f55cd738640407b18..95b5e62634da501889e1dd0d2f65327e1a02b56d 100644 (file)
--- 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 */

diff --git a/src/term.h b/src/term.h
index b1fde048739041069ff539fa554ceec4e1a1c4ab..cc9f8ac9f1d272652c07fc072942077c900e9b61 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index ed64ecec12c18a0742beae0f925d6c1da71576bd..3863fae154a419af762c0b3b4fdbe9e599d2ea13 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    176,
 /**/
     175,
 /**/