summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68>2022-06-26 10:55:35 +0000
committerylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68>2022-06-26 10:55:35 +0000
commit3c19f4e174c887e2a3f66320d0401eea7554344c (patch)
tree0cf984bcb194be77b7ee7112d6769f27f71095cd
parent09f1a19753c98eab09f4a29c8648ca05d6f53fe9 (diff)
downloadlibapr-3c19f4e174c887e2a3f66320d0401eea7554344c.tar.gz
test/testlock: Follow up to r1902219: Axe spurious merge artifact.
Somehow one of the "return NULL" was already in 1.8.x, don't double it. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.8.x@1902254 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--test/testlock.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/testlock.c b/test/testlock.c
index d2f9b2a49..e3437c11f 100644
--- a/test/testlock.c
+++ b/test/testlock.c
@@ -111,7 +111,6 @@ static void *APR_THREAD_FUNC thread_mutex_function(apr_thread_t *thd, void *data
break;
}
return NULL;
- return NULL;
}
/* Sleepy-loop until f_ value matches val: */