summaryrefslogtreecommitdiff
path: root/test/testlock.c
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2017-04-07 15:14:51 +0000
committerYann Ylavic <ylavic@apache.org>2017-04-07 15:14:51 +0000
commitedf5c6739f468d49932f13fc6ba7a10c2844d730 (patch)
treef96506eb16750eacebb35a8eaec42c44b747227a /test/testlock.c
parent27939f2af12a94e2fbc8a8703fa28e6c9a833c1c (diff)
downloadapr-edf5c6739f468d49932f13fc6ba7a10c2844d730.tar.gz
locks: follow up to r1790488, r1790521 and r1790523: likewise for the tests.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790569 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/testlock.c')
-rw-r--r--test/testlock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/testlock.c b/test/testlock.c
index 095134e05..40da791b7 100644
--- a/test/testlock.c
+++ b/test/testlock.c
@@ -91,7 +91,7 @@ static void *APR_THREAD_FUNC thread_mutex_function(apr_thread_t *thd, void *data
while (1)
{
if (data) {
- apr_thread_mutex_timedlock(thread_mutex, *(apr_time_t *)data);
+ apr_thread_mutex_timedlock(thread_mutex, *(apr_interval_time_t *)data);
}
else {
apr_thread_mutex_lock(thread_mutex);
@@ -187,7 +187,7 @@ static void test_thread_timedmutex(abts_case *tc, void *data)
{
apr_thread_t *t1, *t2, *t3, *t4;
apr_status_t s1, s2, s3, s4;
- apr_time_t timeout;
+ apr_interval_time_t timeout;
s1 = apr_thread_mutex_create(&thread_mutex, APR_THREAD_MUTEX_TIMED, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, s1);
@@ -345,8 +345,8 @@ static void test_timeoutcond(abts_case *tc, void *data)
static void test_timeoutmutex(abts_case *tc, void *data)
{
apr_status_t s;
+ apr_interval_time_t timeout;
apr_time_t begin, end;
- apr_time_t timeout;
int i;
s = apr_thread_mutex_create(&timeout_mutex, APR_THREAD_MUTEX_TIMED, p);