summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-06 22:27:28 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-06 22:27:28 +0200
commit00ff380295338eedb6138ce87590cc6bed102e9d (patch)
tree967fed31073ad3fe0e802bd3e72f06c04b3cd3e3
parent8e97bd74b5377753597e3d98e7123d8985c7fffd (diff)
downloadvim-git-7.4.2171.tar.gz
patch 7.4.2171v7.4.2171
Problem: MS-Windows build fails. Solution: Add QueryPerformanceCounter().
-rw-r--r--src/ex_cmds2.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index f6c054b8d..6cf26e993 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1259,6 +1259,9 @@ add_timer_info(typval_T *rettv, timer_T *timer)
dictitem_T *di;
long remaining;
proftime_T now;
+# ifdef WIN3264
+ LARGE_INTEGER fr;
+#endif
if (dict == NULL)
return;
@@ -1269,6 +1272,7 @@ add_timer_info(typval_T *rettv, timer_T *timer)
profile_start(&now);
# ifdef WIN3264
+ QueryPerformanceFrequency(&fr);
remaining = (long)(((double)(timer->tr_due.QuadPart - now.QuadPart)
/ (double)fr.QuadPart) * 1000);
# else
diff --git a/src/version.c b/src/version.c
index b1be507af..98dd5f4b2 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 */
/**/
+ 2171,
+/**/
2170,
/**/
2169,