]> granicus.if.org Git - vim/commitdiff
patch 8.0.0690: compiler warning on non-Unix system v8.0.0690
authorBram Moolenaar <Bram@vim.org>
Thu, 29 Jun 2017 20:27:24 +0000 (22:27 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 29 Jun 2017 20:27:24 +0000 (22:27 +0200)
Problem:    Compiler warning on non-Unix system.
Solution:   Add #ifdef. (John Marriott)

src/term.c
src/version.c

index 0dbe6d500b263ffd9511d87249908d40f43c2a9e..989d6b7af61b3fe759e1d295fd0eec91e1449c9a 100644 (file)
@@ -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;
            }
        }
index 64f035dbd9bda42002cca14efaebc51d351d6037..27f04365e41958303d8f38acf032eb8969ce385a 100644 (file)
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    690,
 /**/
     689,
 /**/