cvs commit: apache-2.0/src/lib/apr/lib apr_pools.c

[gstein]

gstein      99/11/26 17:08:15

  Modified:    src/lib/apr/lib apr_pools.c
  Log:
  correct some build errors.
  Submitted by: Eric Dumas <[EMAIL PROTECTED]>
  Reviewed by: gstein
  
  Revision  Changes    Path
  1.23      +4 -4      apache-2.0/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- apr_pools.c       1999/11/24 22:30:06     1.22
  +++ apr_pools.c       1999/11/27 01:08:14     1.23
  @@ -203,12 +203,12 @@
   
   #define APR_ABORT(conditional, retcode, func, str) \
       if (conditional) { \
  -        if (func == NULL) { \
  +        if ((func) == NULL) { \
               return NULL; \
           } \
           else { \
  -            fprintf(stderr, "%s", str);
  -            func(retcode); \
  +            fprintf(stderr, "%s", str); \
  +            (*(func))(retcode); \
           } \
       }
   
  @@ -278,7 +278,7 @@
   #endif /* ALLOC_STATS */
   
       blok = (union block_hdr *) malloc(size + sizeof(union block_hdr));
  -    APR_ABORT(blok == NULL, APR_ENOMEM, (*apr_abort)
  +    APR_ABORT(blok == NULL, APR_ENOMEM, apr_abort,
                 "Ouch!  malloc failed in malloc_block()\n");
       debug_fill(blok, size + sizeof(union block_hdr));
       blok->h.next = NULL;