Preserve Justin's desire for a larger namespace with s/signed/unsigned/ int
while not destroying the binary compatibility of field sizes.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@58827 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/include/apr_queue.h b/include/apr_queue.h
index f589d82..e1f8ff4 100644
--- a/include/apr_queue.h
+++ b/include/apr_queue.h
@@ -94,7 +94,7 @@
* @param a pool to allocate queue from
*/
APU_DECLARE(apr_status_t) apr_queue_create(apr_queue_t **queue,
- apr_uint32_t queue_capacity,
+ unsigned int queue_capacity,
apr_pool_t *a);
/**
@@ -151,7 +151,7 @@
* @param queue the queue
* @returns the size of the queue
*/
-APU_DECLARE(apr_uint32_t) apr_queue_size(apr_queue_t *queue);
+APU_DECLARE(unsigned int) apr_queue_size(apr_queue_t *queue);
/**
* interrupt all the threads blocking on this queue.
diff --git a/misc/apr_queue.c b/misc/apr_queue.c
index 94fd6fd..a703041 100644
--- a/misc/apr_queue.c
+++ b/misc/apr_queue.c
@@ -81,10 +81,10 @@
struct apr_queue_t {
void **data;
- apr_uint32_t nelts; /**< # elements */
- apr_uint32_t in; /**< next empty location */
- apr_uint32_t out; /**< next filled location */
- apr_uint32_t bounds;/**< max size of queue */
+ unsigned int nelts; /**< # elements */
+ unsigned int in; /**< next empty location */
+ unsigned int out; /**< next filled location */
+ unsigned int bounds;/**< max size of queue */
apr_thread_mutex_t *one_big_mutex;
apr_thread_cond_t *not_empty;
apr_thread_cond_t *not_full;
@@ -136,7 +136,7 @@
* Initialize the apr_queue_t.
*/
APU_DECLARE(apr_status_t) apr_queue_create(apr_queue_t **q,
- apr_uint32_t queue_capacity,
+ unsigned int queue_capacity,
apr_pool_t *a)
{
apr_status_t rv;
@@ -288,7 +288,7 @@
/**
* not thread safe
*/
-APU_DECLARE(apr_uint32_t) apr_queue_size(apr_queue_t *queue) {
+APU_DECLARE(unsigned int) apr_queue_size(apr_queue_t *queue) {
return queue->nelts;
}
