Mercurial > vim
diff src/gui.c @ 15525:3ef31ce9d9f9 v8.1.0770
patch 8.1.0770: inconsistent use of ELAPSED_FUNC
commit https://github.com/vim/vim/commit/1ac56c2d11da5ffa44db23e1fd0c533d02ab2f66
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 17 22:28:22 2019 +0100
patch 8.1.0770: inconsistent use of ELAPSED_FUNC
Problem: Inconsistent use of ELAPSED_FUNC.
Solution: Consistently use ELAPSED_FUNC. Also turn ELAPSED_TYPE into a
typedef. (Ozaki Kiichi, closes #3815)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 17 Jan 2019 22:30:06 +0100 |
| parents | 41fbbcea0f1b |
| children | dd725a8ab112 |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -2951,9 +2951,9 @@ gui_wait_for_chars_or_timer(long wtime) int gui_wait_for_chars(long wtime, int tb_change_cnt) { - int retval; + int retval; #if defined(ELAPSED_FUNC) - ELAPSED_TYPE start_tv; + elapsed_T start_tv; #endif #ifdef FEAT_MENU @@ -3002,7 +3002,7 @@ gui_wait_for_chars(long wtime, int tb_ch if (gui_wait_for_chars_or_timer(p_ut) == OK) retval = OK; else if (trigger_cursorhold() -#ifdef ELAPSED_FUNC +#if defined(ELAPSED_FUNC) && ELAPSED_FUNC(start_tv) >= p_ut #endif && typebuf.tb_change_cnt == tb_change_cnt)