apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1761279 - in /apr/apr/trunk/locks/netware: proc_mutex.c thread_cond.c thread_mutex.c
Date Sat, 17 Sep 2016 21:22:25 GMT
Author: ylavic
Date: Sat Sep 17 21:22:25 2016
New Revision: 1761279

URL: http://svn.apache.org/viewvc?rev=1761279&view=rev
Log:
locks/netware: follow up to r1667962 and r1667900: fix typos (compile errors).


Modified:
    apr/apr/trunk/locks/netware/proc_mutex.c
    apr/apr/trunk/locks/netware/thread_cond.c
    apr/apr/trunk/locks/netware/thread_mutex.c

Modified: apr/apr/trunk/locks/netware/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/netware/proc_mutex.c?rev=1761279&r1=1761278&r2=1761279&view=diff
==============================================================================
--- apr/apr/trunk/locks/netware/proc_mutex.c (original)
+++ apr/apr/trunk/locks/netware/proc_mutex.c Sat Sep 17 21:22:25 2016
@@ -72,7 +72,7 @@ APR_DECLARE(apr_status_t) apr_proc_mutex
     return APR_ENOLOCK;
 }
 
-APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_thread_mutex_t *mutex,
+APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_proc_mutex_t *mutex,
                                                    apr_time_t timeout,
                                                    int absolute)
 {

Modified: apr/apr/trunk/locks/netware/thread_cond.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/netware/thread_cond.c?rev=1761279&r1=1761278&r2=1761279&view=diff
==============================================================================
--- apr/apr/trunk/locks/netware/thread_cond.c (original)
+++ apr/apr/trunk/locks/netware/thread_cond.c Sat Sep 17 21:22:25 2016
@@ -73,7 +73,7 @@ APR_DECLARE(apr_status_t) apr_thread_con
         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;

Modified: apr/apr/trunk/locks/netware/thread_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/netware/thread_mutex.c?rev=1761279&r1=1761278&r2=1761279&view=diff
==============================================================================
--- apr/apr/trunk/locks/netware/thread_mutex.c (original)
+++ apr/apr/trunk/locks/netware/thread_mutex.c Sat Sep 17 21:22:25 2016
@@ -55,7 +55,7 @@ APR_DECLARE(apr_status_t) apr_thread_mut
 
     if (flags & APR_THREAD_MUTEX_TIMED) {
         apr_status_t rv = apr_thread_cond_create(&new_mutex->cond, pool);
-        if (rv != SUCCESS) {
+        if (rv != APR_SUCCESS) {
             NXMutexFree(new_mutex->mutex);        
             return rv;
         }
@@ -121,7 +121,7 @@ APR_DECLARE(apr_status_t) apr_thread_mut
         if (mutex->locked) {
             mutex->num_waiters++;
             if (timeout < 0) {
-                rv = apr_thread_cond_dwait(mutex->cond, mutex);
+                rv = apr_thread_cond_wait(mutex->cond, mutex);
             }
             else {
                 if (absolute) {



Mime
View raw message