apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: apr/lib apr_pools.c
Date Thu, 11 Jan 2001 06:25:08 GMT
rbb         01/01/10 22:25:08

  Modified:    .        CHANGES
               include  apr_pools.h
               lib      apr_pools.c
  Log:
  Add APR_DECLARE to some of APR's function declarations.  This helps with
  linking on some platforms.
  Submitted by:	Gregory Nicholls <gnicholls@level8.com>
  
  Revision  Changes    Path
  1.39      +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- CHANGES	2001/01/09 11:05:32	1.38
  +++ CHANGES	2001/01/11 06:25:07	1.39
  @@ -1,5 +1,8 @@
   Changes with APR b1
   
  +  *) Specify APR_DECLARE to some of the APR functions.  This helps linking
  +     on some operating systems.  [Gregory Nicholls <gnicholls@level8.com>]
  +
     *) Libtool'ized APR and converted all the makefiles to share rules
        from helpers/rules.mk. [Greg Stein]
   
  
  
  
  1.38      +10 -5     apr/include/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_pools.h,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- apr_pools.h	2000/12/31 18:04:59	1.37
  +++ apr_pools.h	2001/01/11 06:25:07	1.38
  @@ -214,8 +214,9 @@
    *               ever be used outside of APR.
    * @tip Programs do NOT need to call this directly.  APR will call this
    *      automatically from apr_initialize. 
  + * @deffunc apr_status_t apr_init_alloc(apr_pool_t *globalp)
    */
  -apr_status_t apr_init_alloc(apr_pool_t *globalp);	/* Set up everything */
  +APR_DECLARE(apr_status_t) apr_init_alloc(apr_pool_t *globalp);
   
   /**
    * Tear down all of the internal structures required to use pools
  @@ -224,8 +225,9 @@
    *               ever be used outside of APR.
    * @tip Programs do NOT need to call this directly.  APR will call this
    *      automatically from apr_terminate. 
  + * @deffunc void apr_term_alloc(apr_pool_t *globalp)
    */
  -void apr_term_alloc(apr_pool_t *globalp);        /* Tear down everything */
  +APR_DECLARE(void) apr_term_alloc(apr_pool_t *globalp); 
    
   /* pool functions */
   
  @@ -236,8 +238,9 @@
    *        pool.  If it is non-NULL, the new pool will inherit all
    *        of it's parent pool's attributes, except the apr_pool_t will 
    *        be a sub-pool.
  + * @deffunc apr_status_t apr_create_pool(apr_pool_t **newcont, apr_pool_t *cont)
    */
  -apr_status_t apr_create_pool(apr_pool_t **newcont, apr_pool_t *cont);
  +APR_DECLARE(apr_status_t) apr_create_pool(apr_pool_t **newcont, apr_pool_t *cont);
   
   /**
    * Set the data associated with the current pool
  @@ -253,8 +256,9 @@
    *      data by choosing a key that another part of the program is using
    *      It is advised that steps are taken to ensure that a unique
    *      key is used at all times.
  + * @deffunc apr_status_t apr_set_userdata(const void *data, const char *key, apr_status_t
(*cleanup) (void *), apr_pool_t *cont)
    */
  -apr_status_t apr_set_userdata(const void *data, const char *key, 
  +APR_DECLARE(apr_status_t) apr_set_userdata(const void *data, const char *key, 
                               apr_status_t (*cleanup) (void *), 
                               apr_pool_t *cont);
   
  @@ -263,8 +267,9 @@
    * @param data The key for the data to retrieve
    * @param key The user data associated with the pool.
    * @param cont The current pool.
  + * @deffunc apr_status_t apr_get_userdata(void **data, const char *key, apr_pool_t *cont)
    */
  -apr_status_t apr_get_userdata(void **data, const char *key, apr_pool_t *cont);
  +APR_DECLARE(apr_status_t) apr_get_userdata(void **data, const char *key, apr_pool_t *cont);
   
   /**
    * make a sub pool from the current pool
  
  
  
  1.83      +5 -5      apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apr/lib/apr_pools.c,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- apr_pools.c	2001/01/06 15:18:48	1.82
  +++ apr_pools.c	2001/01/11 06:25:07	1.83
  @@ -537,7 +537,7 @@
   #endif
   
   /* ### why do we have this, in addition to apr_make_sub_pool? */
  -apr_status_t apr_create_pool(apr_pool_t **newcont, apr_pool_t *cont)
  +APR_DECLARE(apr_status_t) apr_create_pool(apr_pool_t **newcont, apr_pool_t *cont)
   {
       apr_pool_t *newpool;
   
  @@ -667,7 +667,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_init_alloc(apr_pool_t *globalp)
  +APR_DECLARE(apr_status_t) apr_init_alloc(apr_pool_t *globalp)
   {
   #if APR_HAS_THREADS
       apr_status_t status;
  @@ -701,7 +701,7 @@
       return APR_SUCCESS;
   }
   
  -void apr_term_alloc(apr_pool_t *globalp)
  +APR_DECLARE(void) apr_term_alloc(apr_pool_t *globalp)
   {
   #if APR_HAS_THREADS
       apr_destroy_lock(alloc_mutex);
  @@ -999,7 +999,7 @@
    * User data management functions
    */
   
  -apr_status_t apr_set_userdata(const void *data, const char *key,
  +APR_DECLARE(apr_status_t) apr_set_userdata(const void *data, const char *key,
   			      apr_status_t (*cleanup) (void *),
   			      apr_pool_t *cont)
   {
  @@ -1020,7 +1020,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_get_userdata(void **data, const char *key, apr_pool_t *cont)
  +APR_DECLARE(apr_status_t) apr_get_userdata(void **data, const char *key, apr_pool_t *cont)
   {
       if (cont->prog_data == NULL)
           *data = NULL;
  
  
  

Mime
View raw message