apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stri...@apache.org
Subject cvs commit: apr/memory/unix apr_pools.c
Date Wed, 30 Jan 2002 13:10:16 GMT
striker     02/01/30 05:10:16

  Modified:    memory/unix apr_pools.c
  Log:
  Get rid of the getpid warning.
  Cast void * to char * before doing pointer arithmetic.
  
  Revision  Changes    Path
  1.146     +5 -2      apr/memory/unix/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -r1.145 -r1.146
  --- apr_pools.c	26 Jan 2002 23:02:32 -0000	1.145
  +++ apr_pools.c	30 Jan 2002 13:10:16 -0000	1.146
  @@ -56,7 +56,6 @@
   #include "apr_private.h"
   
   #include "apr_portable.h" /* for get_os_proc */
  -#include "apr_thread_proc.h" /* for getpid */
   #include "apr_strings.h"
   #include "apr_general.h"
   #include "apr_pools.h"
  @@ -71,6 +70,10 @@
   #include <stdlib.h>     /* for malloc, free and abort */
   #endif
   
  +#if APR_HAVE_UNISTD_H
  +#include <unistd.h>     /* for getpid */
  +#endif
  + 
   
   /*
    * Debug level
  @@ -1467,7 +1470,7 @@
   
       while (node) {
           for (index = 0; index < node->index; index++) {
  -            size += node->endp[index] - node->beginp[index];
  +            size += (char *)node->endp[index] - (char *)node->beginp[index];
           }
   
           node = node->next;
  
  
  

Mime
View raw message