Mercurial > vim

diff src/vim.h @ 15525:3ef31ce9d9f9 v8.1.0770

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2ad5f0ffaa2e
children dd725a8ab112
line wrap: on
line diff
--- a/src/vim.h
+++ b/src/vim.h
@@ -2625,17 +2625,15 @@ typedef enum {
 # define ELAPSED_TIMEVAL
 # define ELAPSED_INIT(v) gettimeofday(&v, NULL)
 # define ELAPSED_FUNC(v) elapsed(&v)
-# define ELAPSED_TYPE struct timeval
-    long elapsed(struct timeval *start_tv);
-#else
-# if defined(WIN32)
-#  define ELAPSED_TICKCOUNT
-#  define ELAPSED_INIT(v) v = GetTickCount()
-#  define ELAPSED_FUNC(v) elapsed(v)
-#  define ELAPSED_TYPE DWORD
-#   ifndef PROTO
-     long elapsed(DWORD start_tick);
-#   endif
+typedef struct timeval elapsed_T;
+long elapsed(struct timeval *start_tv);
+#elif defined(WIN32)
+# define ELAPSED_TICKCOUNT
+# define ELAPSED_INIT(v) v = GetTickCount()
+# define ELAPSED_FUNC(v) elapsed(v)
+typedef DWORD elapsed_T;
+# ifndef PROTO
+long elapsed(DWORD start_tick);
 # endif
 #endif