You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by ra...@apache.org on 2003/06/18 04:08:43 UTC

cvs commit: httpd-apreq-2/src apreq.c apreq.h

randyk      2003/06/17 19:08:43

  Modified:    src      apreq.c apreq.h
  Log:
  Reviewed by:	joes
  For the benefit of Win32, don't declare apreq_copy_value and
  apreq_merge_values with APREQ_DECLARE.
  
  Revision  Changes    Path
  1.20      +4 -4      httpd-apreq-2/src/apreq.c
  
  Index: apreq.c
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/src/apreq.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- apreq.c	7 Jun 2003 20:07:41 -0000	1.19
  +++ apreq.c	18 Jun 2003 02:08:43 -0000	1.20
  @@ -84,8 +84,8 @@
   }
   
   
  -APREQ_DECLARE(apreq_value_t *)apreq_copy_value(apr_pool_t *p, 
  -                                               const apreq_value_t *val)
  +apreq_value_t * apreq_copy_value(apr_pool_t *p, 
  +                                 const apreq_value_t *val)
   {
       apreq_value_t *v;
       if (val == NULL)
  @@ -101,8 +101,8 @@
       return v;
   }
   
  -APREQ_DECLARE(apreq_value_t *)apreq_merge_values(apr_pool_t *p,
  -                                           const apr_array_header_t *arr)
  +apreq_value_t * apreq_merge_values(apr_pool_t *p,
  +                                   const apr_array_header_t *arr)
   {
       apreq_value_t *a = *(apreq_value_t **)(arr->elts);
       apreq_value_t *v = apreq_char_to_value( apreq_join(p, ", ", arr, AS_IS) );
  
  
  
  1.24      +4 -4      httpd-apreq-2/src/apreq.h
  
  Index: apreq.h
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/src/apreq.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apreq.h	17 Jun 2003 06:16:36 -0000	1.23
  +++ apreq.h	18 Jun 2003 02:08:43 -0000	1.24
  @@ -159,16 +159,16 @@
    * @param p  Pool.
    * @param val Original value to copy.
    */
  -APREQ_DECLARE(apreq_value_t *) apreq_copy_value(apr_pool_t *p, 
  -                                                const apreq_value_t *val);
  +apreq_value_t * apreq_copy_value(apr_pool_t *p, 
  +                                 const apreq_value_t *val);
   
   /**
    * Merges an array of values into one.
    * @param p   Pool from which the new value is generated.
    * @param arr Array of apr_value_t *.
    */
  -APREQ_DECLARE(apreq_value_t *) apreq_merge_values(apr_pool_t *p, 
  -                                            const apr_array_header_t *arr);
  +apreq_value_t * apreq_merge_values(apr_pool_t *p, 
  +                                   const apr_array_header_t *arr);
   
   /**
    * Fetches the enctype from the environment.