kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #474 in FS/freeswitch from ~ARTURZ/freeswitch:FS-8141-add-apr_queue_term to master 

* commit '9e29ea01b59280845f481f5b7b3743251c77dd50':
  FS-8141 Add support for apr_queue_term() to switch_apr.c
This commit is contained in:
Anthony Minessale II 2015-09-09 10:48:01 -05:00 committed by Anthony Minessale
parent a223dd0236
commit 4892f95216
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_apr.h
View File

@ -659,6 +659,8 @@ SWITCH_DECLARE(switch_status_t) switch_queue_trypop(switch_queue_t *queue, void
SWITCH_DECLARE(switch_status_t) switch_queue_interrupt_all(switch_queue_t *queue);
SWITCH_DECLARE(switch_status_t) switch_queue_term(switch_queue_t *queue);
/**
* push/add a object to the queue, returning immediatly if the queue is full
*

6
src/switch_apr.c
View File

@ -1077,7 +1077,6 @@ SWITCH_DECLARE(switch_status_t) switch_queue_pop_timeout(switch_queue_t *queue,
return apr_queue_pop_timeout(queue, data, timeout);
}
SWITCH_DECLARE(switch_status_t) switch_queue_push(switch_queue_t *queue, void *data)
{
apr_status_t s;
@ -1099,6 +1098,11 @@ SWITCH_DECLARE(switch_status_t) switch_queue_interrupt_all(switch_queue_t *queue
return apr_queue_interrupt_all(queue);
}
SWITCH_DECLARE(switch_status_t) switch_queue_term(switch_queue_t *queue)
{
return apr_queue_term(queue);
}
SWITCH_DECLARE(switch_status_t) switch_queue_trypush(switch_queue_t *queue, void *data)
{
apr_status_t s;