]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
add non opaque return for switch_thread_cond_timedwait
authorMichael Jerris <mike@jerris.com>
Mon, 2 Nov 2009 22:36:01 +0000 (22:36 +0000)
committerMichael Jerris <mike@jerris.com>
Mon, 2 Nov 2009 22:36:01 +0000 (22:36 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15322 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/switch_apr.c

index 028c4a5da3ca5f4a97ef7b058049ab2db95e7661..6a0592badcfdd9abc08ba9e6ca3be84ae0d3c802 100644 (file)
@@ -365,7 +365,13 @@ SWITCH_DECLARE(switch_status_t) switch_thread_cond_wait(switch_thread_cond_t *co
 
 SWITCH_DECLARE(switch_status_t) switch_thread_cond_timedwait(switch_thread_cond_t *cond, switch_mutex_t *mutex, switch_interval_time_t timeout)
 {
-       return apr_thread_cond_timedwait(cond, mutex, timeout);
+       apr_status_t st = apr_thread_cond_timedwait(cond, mutex, timeout);
+
+       if (st == APR_TIMEUP) {
+               st = SWITCH_STATUS_TIMEOUT;
+       }
+
+       return st;
 }
 
 SWITCH_DECLARE(switch_status_t) switch_thread_cond_signal(switch_thread_cond_t *cond)