cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-08 11:53:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add regress_finalize to makefile.nmake

Browse Source
This commit is contained in:
Nick Mathewson 2013-05-01 13:37:57 -04:00
parent 57cbfcd67c
commit 85a40040d1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
evutil_time.c
View File

@ -443,14 +443,14 @@ evutil_gettime_monotonic_(struct evutil_monotonic_timer *base,
* accurate as we can; adjust_monotnonic_time() below * accurate as we can; adjust_monotnonic_time() below
* will keep it monotonic. */ * will keep it monotonic. */
counter_usec_elapsed = ticks_elapsed * 1000; counter_usec_elapsed = ticks_elapsed * 1000;
base->first_counter = counter.QuadPart - counter_usec_elapsed / base->usec_per_count; base->first_counter = (ev_uint64_t) (counter.QuadPart - counter_usec_elapsed / base->usec_per_count);
} }
tp->tv_sec = counter_usec_elapsed / 1000000; tp->tv_sec = (time_t) (counter_usec_elapsed / 1000000);
tp->tv_usec = counter_usec_elapsed % 1000000; tp->tv_usec = counter_usec_elapsed % 1000000;
} else { } else {
/* We're just using GetTickCount(). */ /* We're just using GetTickCount(). */
tp->tv_sec = ticks / 1000; tp->tv_sec = (time_t) (ticks / 1000);
tp->tv_usec = (ticks % 1000) * 1000; tp->tv_usec = (ticks % 1000) * 1000;
} }
adjust_monotonic_time(base, tp); adjust_monotonic_time(base, tp);

2
test/Makefile.nmake
View File

@ -20,7 +20,7 @@ REGRESS_OBJS=regress.obj regress_buffer.obj regress_http.obj regress_dns.obj \
regress_et.obj regress_bufferevent.obj \ regress_et.obj regress_bufferevent.obj \
regress_listener.obj regress_util.obj tinytest.obj \ regress_listener.obj regress_util.obj tinytest.obj \
regress_main.obj regress_minheap.obj regress_iocp.obj \ regress_main.obj regress_minheap.obj regress_iocp.obj \
regress_thread.obj $(SSL_OBJS) regress_thread.obj regress_finalize.obj $(SSL_OBJS)
OTHER_OBJS=test-init.obj test-eof.obj test-weof.obj test-time.obj \ OTHER_OBJS=test-init.obj test-eof.obj test-weof.obj test-time.obj \
bench.obj bench_cascade.obj bench_http.obj bench_httpclient.obj \ bench.obj bench_cascade.obj bench_http.obj bench_httpclient.obj \