changeset 11615:568ea579d20e v8.0.0690

patch 8.0.0690: compiler warning on non-Unix system commit https://github.com/vim/vim/commit/c2226845eb207bcd1a24e1afa941acbfecbc5170 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jun 29 22:27:24 2017 +0200 patch 8.0.0690: compiler warning on non-Unix system Problem: Compiler warning on non-Unix system. Solution: Add #ifdef. (John Marriott)
author Christian Brabandt <cb@256bit.org>
date Thu, 29 Jun 2017 22:30:04 +0200
parents f62e103bb674
children 48ca57b8b2a7
files src/term.c src/version.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/term.c
+++ b/src/term.c
@@ -2524,7 +2524,9 @@ out_str_cf(char_u *s)
 {
     if (s != NULL && *s)
     {
+#ifdef HAVE_TGETENT
 	char_u *p;
+#endif
 
 #ifdef FEAT_GUI
 	/* Don't use tputs() when GUI is used, ncurses crashes. */
@@ -2549,7 +2551,7 @@ out_str_cf(char_u *s)
 		tputs((char *)p, 1, TPUTSFUNCAST out_char_nf);
 		*s = save_c;
 		out_flush();
-#ifdef ELAPSED_FUNC
+# ifdef ELAPSED_FUNC
 		/* Only sleep here if we can limit this happening in
 		 * vim_beep(). */
 		p = vim_strchr(s, '>');
@@ -2563,10 +2565,10 @@ out_str_cf(char_u *s)
 		    ++p;
 		    do_sleep(duration);
 		}
-#else
+# else
 		/* Rely on the terminal library to sleep. */
 		p = s;
-#endif
+# endif
 		break;
 	    }
 	}
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    690,
+/**/
     689,
 /**/
     688,