httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/file_io/unix fileio.h readwrite.c
Date Mon, 12 Jun 2000 13:51:23 GMT
dreid       00/06/12 06:51:22

  Modified:    src/lib/apr/file_io/unix fileio.h readwrite.c
  Log:
  Another change to allow the newest version of BeOS to be used to it's
  full potential.
  
  Revision  Changes    Path
  1.20      +3 -0      apache-2.0/src/lib/apr/file_io/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- fileio.h	2000/04/22 06:16:20	1.19
  +++ fileio.h	2000/06/12 13:51:22	1.20
  @@ -98,6 +98,9 @@
   #ifdef BEOS
   #include <kernel/OS.h>
   #endif
  +#if BEOS && HAVE_ARPA_INET_H
  +#include <sys/socket.h> /* for fd_set definitions */
  +#endif
   /* End System headers */
   
   #define APR_FILE_BUFSIZE 4096
  
  
  
  1.52      +7 -3      apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- readwrite.c	2000/06/01 22:23:16	1.51
  +++ readwrite.c	2000/06/12 13:51:22	1.52
  @@ -55,7 +55,11 @@
   #include "fileio.h"
   #include "apr_lock.h"
   
  -#ifndef BEOS
  +#if !BEOS || (BEOS && HAVE_ARPA_INET_H)
  +#define USE_WAIT_FOR_IO
  +#endif
  +
  +#ifdef USE_WAIT_FOR_IO
   static ap_status_t wait_for_io_or_timeout(ap_file_t *file, int for_read)
   {
       struct timeval tv, *tvptr;
  @@ -159,7 +163,7 @@
           do {
               rv = read(thefile->filedes, buf, *nbytes);
           } while (rv == -1 && errno == EINTR);
  -#ifndef BEOS
  +#ifdef USE_WAIT_FOR_IO
           if (rv == -1 && 
               (errno == EAGAIN || errno == EWOULDBLOCK) && 
               thefile->timeout != 0) {
  @@ -232,7 +236,7 @@
           do {
               rv = write(thefile->filedes, buf, *nbytes);
           } while (rv == (ap_size_t)-1 && errno == EINTR);
  -#ifndef BEOS
  +#ifdef USE_WAIT_FOR_IO
           if (rv == (ap_size_t)-1 &&
               (errno == EAGAIN || errno == EWOULDBLOCK) && 
               thefile->timeout != 0) {
  
  
  

Mime
View raw message