apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject cvs commit: apr/network_io/beos sendrecv.c
Date Fri, 27 Jul 2001 01:27:07 GMT
dreid       01/07/26 18:27:07

  Modified:    .        configure.in
               network_io/beos sendrecv.c
  Log:
  Couple of fixes for pre-BONE beos...
  - correctly set the file_as_socket
  - add the apr_wait_for_timeout so it's visible
  
  These come from Brad Froehle.
  
  Submitted by:	Brad Froehle <bradley_f@hotmail.com>
  Reviewed by:	David Reid <dreid@apache.org>
  
  Revision  Changes    Path
  1.346     +8 -5      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.345
  retrieving revision 1.346
  diff -u -r1.345 -r1.346
  --- configure.in	2001/07/26 00:08:40	1.345
  +++ configure.in	2001/07/27 01:27:07	1.346
  @@ -216,11 +216,14 @@
          APR_CHECK_DEFINE(BONE_VERSION, sys/socket.h)
          eolstr="\\n"
          osver=`uname -r`
  -       if test "$osver"="5.0.4"; then
  -           file_as_socket="1"
  -       else
  -           file_as_socket="0"
  -       fi
  +       case $osver in
  +          5.0.4)
  +             file_as_socket="1"
  +             ;;
  +          *)
  +             file_as_socket="0"
  +             ;;
  +       esac
          LOCAL_MM_LIB=""
          ;;
      *os390)
  
  
  
  1.23      +4 -4      apr/network_io/beos/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/beos/sendrecv.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- sendrecv.c	2001/04/04 22:52:45	1.22
  +++ sendrecv.c	2001/07/27 01:27:07	1.23
  @@ -59,7 +59,7 @@
   #include "networkio.h"
   #include "apr_time.h"
   
  -static apr_status_t wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
  +apr_status_t apr_wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
   {
       struct timeval tv, *tvptr;
       fd_set fdset;
  @@ -137,7 +137,7 @@
       } while (rv == -1 && errno == EINTR);
   
       if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) {
  -        apr_status_t arv = wait_for_io_or_timeout(sock, 1);
  +        apr_status_t arv = apr_wait_for_io_or_timeout(sock, 1);
           if (arv != APR_SUCCESS) {
               *len = 0;
               return arv;
  @@ -180,7 +180,7 @@
   
       if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)
           && sock->timeout != 0) {
  -        apr_status_t arv = wait_for_io_or_timeout(sock, 0);
  +        apr_status_t arv = apr_wait_for_io_or_timeout(sock, 0);
           if (arv != APR_SUCCESS) {
               *len = 0;
               return arv;
  @@ -220,7 +220,7 @@
   
       if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) &&
           sock->timeout != 0) {
  -        apr_status_t arv = wait_for_io_or_timeout(sock, 1);
  +        apr_status_t arv = apr_wait_for_io_or_timeout(sock, 1);
           if (arv != APR_SUCCESS) {
               *len = 0;
               return arv;
  
  
  

Mime
View raw message