From c2226845eb207bcd1a24e1afa941acbfecbc5170 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 29 Jun 2017 22:27:24 +0200 Subject: [PATCH] patch 8.0.0690: compiler warning on non-Unix system Problem: Compiler warning on non-Unix system. Solution: Add #ifdef. (John Marriott) --- src/term.c | 8 +++++--- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/term.c b/src/term.c index 0dbe6d500..989d6b7af 100644 --- 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; } } diff --git a/src/version.c b/src/version.c index 64f035dbd..27f04365e 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 690, /**/ 689, /**/ -- 2.50.1