torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson
2011-12-26 17:58:51 -05:00
parent 3aade2fab7 da876aec63
commit 85d7811456
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/timersub_bug
+7
View File
@@ -0,0 +1,7 @@
o Major bugfixes:
- Provide correct replacements for the timeradd() and timersub() functions
for platforms that lack them (for example, windows). The timersub()
function is used when expiring circuits, timeradd() is currently unused.
Patch written by Vektor, who also reported the bug. Thanks! Bugfix
on 0.2.2.24-alpha/0.2.3.1-alpha, fixes bug 4778.
src/common/compat.h
+2 -2
View File
@@ -335,7 +335,7 @@ struct tm *tor_gmtime_r(const time_t *timep, struct tm *result);
#define timeradd(tv1,tv2,tvout) \
do { \
(tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \
(tvout)->tv_usec = (tv2)->tv_usec + (tv2)->tv_usec; \
(tvout)->tv_usec = (tv1)->tv_usec + (tv2)->tv_usec; \
if ((tvout)->tv_usec >= 1000000) { \
(tvout)->tv_usec -= 1000000; \
(tvout)->tv_sec++; \
@@ -349,7 +349,7 @@ struct tm *tor_gmtime_r(const time_t *timep, struct tm *result);
#define timersub(tv1,tv2,tvout) \
do { \
(tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \
(tvout)->tv_usec = (tv2)->tv_usec - (tv2)->tv_usec; \
(tvout)->tv_usec = (tv1)->tv_usec - (tv2)->tv_usec; \
if ((tvout)->tv_usec < 0) { \
(tvout)->tv_usec += 1000000; \
(tvout)->tv_sec--; \