apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: apr-util libaprutil.dsp aprutil.dsp
Date Sun, 22 Dec 2002 21:53:24 GMT
brane       2002/12/22 13:53:24

  Modified:    misc     apr_queue.c
               include  apr_queue.h
               .        libaprutil.dsp aprutil.dsp
  Log:
  Add apr_queue to the Windows build.
  Submitted by Damir Dezeljin <programing@nib.si>
  
  Add apr_queue.h and apr_queue.c to aprutil.dsp and libaprutil.dsp,
  wrap the public function decls with APU_DECLARE, and include apu.h in
  apr_queue.h.
  
  Revision  Changes    Path
  1.5       +10 -10    apr-util/misc/apr_queue.c
  
  Index: apr_queue.c
  ===================================================================
  RCS file: /home/cvs/apr-util/misc/apr_queue.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_queue.c	6 Sep 2002 23:51:56 -0000	1.4
  +++ apr_queue.c	22 Dec 2002 21:53:24 -0000	1.5
  @@ -139,9 +139,9 @@
   /**
    * Initialize the apr_queue_t.
    */
  -apr_status_t apr_queue_create(apr_queue_t **q, 
  -                            int queue_capacity, 
  -                            apr_pool_t *a)
  +APU_DECLARE(apr_status_t) apr_queue_create(apr_queue_t **q, 
  +                                           int queue_capacity, 
  +                                           apr_pool_t *a)
   {
       apr_status_t rv;
       apr_queue_t *queue;
  @@ -186,7 +186,7 @@
    * the push operation has completed, it signals other threads waiting
    * in apr_queue_pop() that they may continue consuming sockets.
    */
  -apr_status_t apr_queue_push(apr_queue_t *queue, void *data)
  +APU_DECLARE(apr_status_t) apr_queue_push(apr_queue_t *queue, void *data)
   {
       apr_status_t rv;
       int need_signal=0;
  @@ -249,7 +249,7 @@
    * the push operation has completed, it signals other threads waiting
    * in apr_queue_pop() that they may continue consuming sockets.
    */
  -apr_status_t apr_queue_trypush(apr_queue_t *queue, void *data)
  +APU_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data)
   {
       apr_status_t rv;
       int need_signal=0;
  @@ -291,7 +291,7 @@
   /**
    * not thread safe
    */
  -int apr_queue_size(apr_queue_t *queue) {
  +APU_DECLARE(int) apr_queue_size(apr_queue_t *queue) {
       return queue->nelts;
   }
   /**
  @@ -300,7 +300,7 @@
    * Once retrieved, the item is placed into the address specified by
    * 'data'.
    */
  -apr_status_t apr_queue_pop(apr_queue_t *queue, void **data)
  +APU_DECLARE(apr_status_t) apr_queue_pop(apr_queue_t *queue, void **data)
   {
       apr_status_t rv;
       int need_signal=0;
  @@ -365,7 +365,7 @@
    * Once retrieved, the item is placed into the address specified by
    * 'data'.
    */
  -apr_status_t apr_queue_trypop(apr_queue_t *queue, void **data)
  +APU_DECLARE(apr_status_t) apr_queue_trypop(apr_queue_t *queue, void **data)
   {
       apr_status_t rv;
       int need_signal=0;
  @@ -405,7 +405,7 @@
       return rv;
   }
   
  -apr_status_t apr_queue_interrupt_all(apr_queue_t *queue)
  +APU_DECLARE(apr_status_t) apr_queue_interrupt_all(apr_queue_t *queue)
   {
       apr_status_t rv;
       Q_DBG( "intr all", queue);    
  @@ -422,7 +422,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_queue_term(apr_queue_t *queue)
  +APU_DECLARE(apr_status_t) apr_queue_term(apr_queue_t *queue)
   {
       apr_status_t rv;
   
  
  
  
  1.5       +11 -10    apr-util/include/apr_queue.h
  
  Index: apr_queue.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_queue.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_queue.h	19 Dec 2002 17:33:30 -0000	1.4
  +++ apr_queue.h	22 Dec 2002 21:53:24 -0000	1.5
  @@ -68,6 +68,7 @@
    * Although condition variables are some times available without threads.
    */
   
  +#include "apu.h"
   #include "apr_errno.h"
   #include "apr_pools.h"
   
  @@ -92,9 +93,9 @@
    * @param queue_capacity maximum size of the queue
    * @param a pool to allocate queue from
    */
  -apr_status_t apr_queue_create(apr_queue_t **queue, 
  -                            int queue_capacity, 
  -                            apr_pool_t *a);
  +APU_DECLARE(apr_status_t) apr_queue_create(apr_queue_t **queue, 
  +                                           int queue_capacity, 
  +                                           apr_pool_t *a);
   
   /**
    * push/add a object to the queue, blocking if the queue is already full
  @@ -105,7 +106,7 @@
    * @returns APR_EOF the queue has been terminated
    * @returns APR_SUCCESS on a successfull push
    */
  -apr_status_t apr_queue_push(apr_queue_t *queue, void *data);
  +APU_DECLARE(apr_status_t) apr_queue_push(apr_queue_t *queue, void *data);
   
   /**
    * pop/get an object from the queue, blocking if the queue is already empty
  @@ -116,7 +117,7 @@
    * @returns APR_EOF if the queue has been terminated
    * @returns APR_SUCCESS on a successfull pop
    */
  -apr_status_t apr_queue_pop(apr_queue_t *queue, void **data);
  +APU_DECLARE(apr_status_t) apr_queue_pop(apr_queue_t *queue, void **data);
   
   /**
    * push/add a object to the queue, returning immediatly if the queue is full
  @@ -128,7 +129,7 @@
    * @returns APR_EOF the queue has been terminated
    * @returns APR_SUCCESS on a successfull push
    */
  -apr_status_t apr_queue_trypush(apr_queue_t *queue, void *data);
  +APU_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data);
   
   /**
    * pop/get an object to the queue, returning immediatly if the queue is empty
  @@ -140,7 +141,7 @@
    * @returns APR_EOF the queue has been terminated
    * @returns APR_SUCCESS on a successfull push
    */
  -apr_status_t apr_queue_trypop(apr_queue_t *queue, void **data);
  +APU_DECLARE(apr_status_t) apr_queue_trypop(apr_queue_t *queue, void **data);
   
   /**
    * returns the size of the queue.
  @@ -150,14 +151,14 @@
    * @param queue the queue
    * @returns the size of the queue
    */
  -int apr_queue_size(apr_queue_t *queue);
  +APU_DECLARE(int) apr_queue_size(apr_queue_t *queue);
   
   /**
    * interrupt all the threads blocking on this queue.
    *
    * @param queue the queue
    */
  -apr_status_t apr_queue_interrupt_all(apr_queue_t *queue);
  +APU_DECLARE(apr_status_t) apr_queue_interrupt_all(apr_queue_t *queue);
   
   /**
    * terminate all queue, sendinging a interupt to all the
  @@ -165,7 +166,7 @@
    *
    * @param queue the queue
    */
  -apr_status_t apr_queue_term(apr_queue_t *queue);
  +APU_DECLARE(apr_status_t) apr_queue_term(apr_queue_t *queue);
   
   #ifdef __cplusplus
   }
  
  
  
  1.44      +8 -0      apr-util/libaprutil.dsp
  
  Index: libaprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.dsp,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- libaprutil.dsp	11 Dec 2002 06:00:26 -0000	1.43
  +++ libaprutil.dsp	22 Dec 2002 21:53:24 -0000	1.44
  @@ -227,6 +227,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\misc\apr_queue.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\misc\apr_rmm.c
   # End Source File
   # End Group
  @@ -504,6 +508,10 @@
   # Begin Source File
   
   SOURCE=.\include\apr_optional_hooks.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apr_queue.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.48      +8 -0      apr-util/aprutil.dsp
  
  Index: aprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.dsp,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- aprutil.dsp	11 Dec 2002 06:00:26 -0000	1.47
  +++ aprutil.dsp	22 Dec 2002 21:53:24 -0000	1.48
  @@ -221,6 +221,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\misc\apr_queue.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\misc\apr_rmm.c
   # End Source File
   # End Group
  @@ -498,6 +502,10 @@
   # Begin Source File
   
   SOURCE=.\include\apr_optional_hooks.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apr_queue.h
   # End Source File
   # Begin Source File
   
  
  
  

Mime
View raw message