You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2003/01/13 21:15:50 UTC
cvs commit: apr-util/misc apr_queue.c
wrowe 2003/01/13 12:15:50
Modified: include apr_queue.h
misc apr_queue.c
Log:
Preserve Justin's desire for a larger namespace with s/signed/unsigned/ int
while not destroying the binary compatibility of field sizes.
Revision Changes Path
1.9 +2 -2 apr-util/include/apr_queue.h
Index: apr_queue.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_queue.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_queue.h 1 Jan 2003 00:02:20 -0000 1.8
+++ apr_queue.h 13 Jan 2003 20:15:50 -0000 1.9
@@ -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.
1.10 +6 -6 apr-util/misc/apr_queue.c
Index: apr_queue.c
===================================================================
RCS file: /home/cvs/apr-util/misc/apr_queue.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apr_queue.c 1 Jan 2003 00:02:22 -0000 1.9
+++ apr_queue.c 13 Jan 2003 20:15:50 -0000 1.10
@@ -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;
}