From 4892f95216c5e88e78efdc78d06f57a5258c8515 Mon Sep 17 00:00:00 2001
From: Anthony Minessale II <anthony.minessale@gmail.com>
Date: Wed, 9 Sep 2015 10:48:01 -0500
Subject: [PATCH] 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
---
src/include/switch_apr.h | 2 ++
src/switch_apr.c | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index 0f872e2296..04b41da6c4 100644
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -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
*
diff --git a/src/switch_apr.c b/src/switch_apr.c
index 5e7dc52dbd..43d27243ec 100644
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -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;