cvs commit: apr-util/include apr_buckets.h

[wr...@apache.org]

wrowe       02/03/31 18:19:22

  Modified:    .        aprutil.dsp libaprutil.dsp
               buckets  apr_buckets_alloc.c
               include  apr_buckets.h
  Log:
    Fix Jerry Baker's observed compilation faults for cvs head and 2.0.34,
    courtesy Cliff Woolley's patch and observations.
  
  Revision  Changes    Path
  1.38      +4 -0      apr-util/aprutil.dsp
  
  Index: aprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.dsp,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- aprutil.dsp	29 Jan 2002 18:29:22 -0000	1.37
  +++ aprutil.dsp	1 Apr 2002 02:19:21 -0000	1.38
  @@ -97,6 +97,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\buckets\apr_buckets_alloc.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\buckets\apr_buckets_eos.c
   # End Source File
   # Begin Source File
  
  
  
  1.32      +4 -0      apr-util/libaprutil.dsp
  
  Index: libaprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.dsp,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- libaprutil.dsp	29 Jan 2002 18:29:22 -0000	1.31
  +++ libaprutil.dsp	1 Apr 2002 02:19:22 -0000	1.32
  @@ -103,6 +103,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\buckets\apr_buckets_alloc.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\buckets\apr_buckets_eos.c
   # End Source File
   # Begin Source File
  
  
  
  1.5       +5 -4      apr-util/buckets/apr_buckets_alloc.c
  
  Index: apr_buckets_alloc.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_alloc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_buckets_alloc.c	30 Mar 2002 12:43:07 -0000	1.4
  +++ apr_buckets_alloc.c	1 Apr 2002 02:19:22 -0000	1.5
  @@ -63,21 +63,22 @@
       int x; /* temporary... some compilers trigger an error on empty structure defs */
   };
   
  -APU_DECLARE(apr_bucket_alloc_t *) apr_bucket_alloc_create(apr_pool_t *p)
  +APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create(apr_pool_t *p)
   {
       return (apr_bucket_alloc_t *)0xFECCFECC;
   }
   
  -APU_DECLARE(void) apr_bucket_alloc_destroy(apr_bucket_alloc_t *list)
  +APU_DECLARE_NONSTD(void) apr_bucket_alloc_destroy(apr_bucket_alloc_t *list)
   {
   }
   
  -APU_DECLARE(void *) apr_bucket_alloc(apr_size_t size, apr_bucket_alloc_t *list)
  +APU_DECLARE_NONSTD(void *) apr_bucket_alloc(apr_size_t size, 
  +                                            apr_bucket_alloc_t *list)
   {
       return malloc(size);
   }
   
  -APU_DECLARE(void) apr_bucket_free(void *block)
  +APU_DECLARE_NONSTD(void) apr_bucket_free(void *block)
   {
       free(block);
   }
  
  
  
  1.134     +4 -4      apr-util/include/apr_buckets.h
  
  Index: apr_buckets.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_buckets.h,v
  retrieving revision 1.133
  retrieving revision 1.134
  diff -u -r1.133 -r1.134
  --- apr_buckets.h	29 Mar 2002 08:12:08 -0000	1.133
  +++ apr_buckets.h	1 Apr 2002 02:19:22 -0000	1.134
  @@ -824,26 +824,26 @@
    *          to allocate the memory handed out by the allocator]
    * @warning The allocator must never be used by more than one thread at a time.
    */
  -APU_DECLARE(apr_bucket_alloc_t *) apr_bucket_alloc_create(apr_pool_t *p);
  +APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create(apr_pool_t *p);
   
   /**
    * Destroy a bucket allocator.
    * @param list The allocator to be destroyed
    */
  -APU_DECLARE(void) apr_bucket_alloc_destroy(apr_bucket_alloc_t *list);
  +APU_DECLARE_NONSTD(void) apr_bucket_alloc_destroy(apr_bucket_alloc_t *list);
   
   /**
    * Allocate memory for use by the buckets.
    * @param size The amount to allocate.
    * @param list The allocator from which to allocate the memory.
    */
  -APU_DECLARE(void *) apr_bucket_alloc(apr_size_t size, apr_bucket_alloc_t *list);
  +APU_DECLARE_NONSTD(void *) apr_bucket_alloc(apr_size_t size, apr_bucket_alloc_t *list);
   
   /**
    * Free memory previously allocated with apr_bucket_alloc().
    * @param block The block of memory to be freed.
    */
  -APU_DECLARE(void) apr_bucket_free(void *block);
  +APU_DECLARE_NONSTD(void) apr_bucket_free(void *block);
   
   
   /*  *****  Bucket Functions  *****  */