You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/08/14 22:02:22 UTC

cvs commit: apache-2.0/src/ap ap_buckets.c

stoddard    00/08/14 13:02:20

  Modified:    src/ap   ap_buckets.c
  Log:
  Protect inclusion of sys/uio.h with HAVE_SYS_UIO_H. FIx argument type problem with
  call to e->read()
  
  Revision  Changes    Path
  1.6       +3 -1      apache-2.0/src/ap/ap_buckets.c
  
  Index: ap_buckets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ap_buckets.c	2000/08/14 03:07:57	1.5
  +++ ap_buckets.c	2000/08/14 20:02:17	1.6
  @@ -58,7 +58,9 @@
   #include "apr_lib.h"
   #include "apr_errno.h"
   #include <stdlib.h>
  +#ifdef HAVE_SYS_UIO_H
   #include <sys/uio.h>
  +#endif
   #include "ap_buckets.h"
   
   API_EXPORT(apr_status_t) ap_bucket_destroy(ap_bucket *e)
  @@ -136,7 +138,7 @@
       orig = vec;
       e = b->head;
       while (e && nvec) {
  -	e->read(e, vec->iov_base, &vec->iov_len, 0);
  +	e->read(e, &vec->iov_base, &vec->iov_len, 0);
   	e = e->next;
   	--nvec;
   	++vec;