]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-4876 reverting this to default
authorAnthony Minessale <anthm@freeswitch.org>
Mon, 17 Dec 2012 17:22:32 +0000 (11:22 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Mon, 17 Dec 2012 17:29:15 +0000 (11:29 -0600)
src/switch_apr.c

index d4db41528084589b37717910737ae90280e169a9..aeb10185a93d09590e051fa6f068b2eb7bbc07d4 100644 (file)
@@ -1050,13 +1050,7 @@ SWITCH_DECLARE(unsigned int) switch_queue_size(switch_queue_t *queue)
 
 SWITCH_DECLARE(switch_status_t) switch_queue_pop(switch_queue_t *queue, void **data)
 {
-       apr_status_t s;
-
-       do {
-               s = apr_queue_pop(queue, data);
-       } while (s == APR_EINTR);
-
-       return s;
+       return apr_queue_pop(queue, data);
 }
 
 SWITCH_DECLARE(switch_status_t) switch_queue_pop_timeout(switch_queue_t *queue, void **data, switch_interval_time_t timeout)
@@ -1078,14 +1072,7 @@ SWITCH_DECLARE(switch_status_t) switch_queue_push(switch_queue_t *queue, void *d
 
 SWITCH_DECLARE(switch_status_t) switch_queue_trypop(switch_queue_t *queue, void **data)
 {
-       apr_status_t s;
-
-       do {
-               s = apr_queue_trypop(queue, data);
-       } while (s == APR_EINTR);
-
-       return s;
-       
+       return apr_queue_trypop(queue, data);
 }
 
 SWITCH_DECLARE(switch_status_t) switch_queue_interrupt_all(switch_queue_t *queue)