]> granicus.if.org Git - libevent/commitdiff
Add regress_finalize to makefile.nmake release-2.1.3-alpha
authorNick Mathewson <nickm@torproject.org>
Wed, 1 May 2013 17:37:57 +0000 (13:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 May 2013 17:37:57 +0000 (13:37 -0400)
evutil_time.c
test/Makefile.nmake

index f677dafc11599e653f35748b17c0fac43342ad83..937e7e371c30c8901119c5635921dc637939248b 100644 (file)
@@ -443,14 +443,14 @@ evutil_gettime_monotonic_(struct evutil_monotonic_timer *base,
                         * accurate as we can; adjust_monotnonic_time() below
                         * will keep it monotonic. */
                        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;
 
        } else {
                /* We're just using GetTickCount(). */
-               tp->tv_sec = ticks / 1000;
+               tp->tv_sec = (time_t) (ticks / 1000);
                tp->tv_usec = (ticks % 1000) * 1000;
        }
        adjust_monotonic_time(base, tp);
index f4372b5c9397bf2871a659bbd006eb88fbe32eb2..19ea4e4943b7e90835e38f2e532e5789e50a9510 100644 (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_listener.obj regress_util.obj tinytest.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 \
        bench.obj bench_cascade.obj bench_http.obj bench_httpclient.obj \