summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--legacy/evil/AUTHORS3
-rw-r--r--legacy/evil/ChangeLog8
-rw-r--r--legacy/evil/src/lib/evil_unistd.c4
3 files changed, 12 insertions, 3 deletions
diff --git a/legacy/evil/AUTHORS b/legacy/evil/AUTHORS
index 6cf170748f..226283dce1 100644
--- a/legacy/evil/AUTHORS
+++ b/legacy/evil/AUTHORS
@@ -1,4 +1,5 @@
1Main Authors: 1Main Authors:
2 Vincent Torri <vtorri at univ-evry dot fr> 2 Vincent Torri <vtorri at univ-evry dot fr>
3 Tor Lillqvist <tml at iki dot fi> (pipe function) 3 Tor Lillqvist <tml at iki dot fi> (pipe function)
4 ashikase 4 Lance Fetters
5 Vincent Richomme <vrichomme at smartmobili dot com>
diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 63830849ff..b883e2911e 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,11 @@
12010-12-10 Vincent Torri <doursse at users dot sf dot net>
2
3 reviewed by: Vincent Torri
4 patch by: Vincent Richomme
5
6 * src/lib/evil_unistd.c:
7 remove warning
8
12010-11-06 Vincent Torri <doursse at users dot sf dot net> 92010-11-06 Vincent Torri <doursse at users dot sf dot net>
2 10
3 * src/lib/Evil.h: 11 * src/lib/Evil.h:
diff --git a/legacy/evil/src/lib/evil_unistd.c b/legacy/evil/src/lib/evil_unistd.c
index 6dcf4cad4d..897c86abab 100644
--- a/legacy/evil/src/lib/evil_unistd.c
+++ b/legacy/evil/src/lib/evil_unistd.c
@@ -72,8 +72,8 @@ evil_gettimeofday(struct timeval *tp, void *tzp __UNUSED__)
72 72
73 QueryPerformanceCounter(&count); 73 QueryPerformanceCounter(&count);
74 diff = count.QuadPart - _evil_time_count; 74 diff = count.QuadPart - _evil_time_count;
75 tp->tv_sec = _evil_time_second + diff / _evil_time_freq; 75 tp->tv_sec = _evil_time_second + (long)(diff / _evil_time_freq);
76 tp->tv_usec = ((diff % _evil_time_freq) * 1000000ll) / _evil_time_freq; 76 tp->tv_usec = (long)(((diff % _evil_time_freq) * 1000000ll) / _evil_time_freq);
77 77
78 return 1; 78 return 1;
79} 79}