On Sun, Sep 18, 2016 at 8:24 AM, NormW <no...@gknw.net> wrote:
> On 18/09/2016 8:52 AM, Yann Ylavic wrote:
>>
>> On Sat, Sep 17, 2016 at 1:30 PM, NormW <no...@gknw.net> wrote:
>>>
>>>> Index: locks/netware/thread_cond.c
>>>> ===================================================================
>>>> --- locks/netware/thread_cond.c (revision 1760898)
>>>> +++ locks/netware/thread_cond.c (working copy)
>>>> @@ -73,7 +73,7 @@
>>>> rc = NXCondWait(cond->cond, mutex->mutex);
>>>> }
>>>> else {
>>>> - timeout = timeout * 1000 / XGetSystemTick();
>>>> + timeout = timeout * 1000 / NXGetSystemTick();
>>>> rc = NXCondTimedWait(cond->cond, mutex->mutex, timeout);
>>>> if (rc == NX_ETIMEDOUT) {
>>>> return APR_TIMEUP;
>>
>>
>> Applied in http://svn.apache.org/r1761279 (trunk had the same issue),
>> and backported to 1.6.x (r1761280).
>
> It also belongs apr-1.5 AFAICT. The '/N seems to confuse the compiler and
> drops the 'N', giving a missing symbol XGetSystemTick().
Hmm, do you get an error when compiling 1.5.x?
This typo was introduced in r1667962 which was not backported to
1.5.x, so apr_thread_cond_timedwait() should use NXGetSystemTick()
(with the leading N) as before there (though not handling negative
timeout, which was the purpose of this commit)...
Regards,
Yann.
