You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by dr...@apache.org on 2001/07/27 03:27:07 UTC
cvs commit: apr/network_io/beos sendrecv.c
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 <br...@hotmail.com>
Reviewed by: David Reid <dr...@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;
Re: cvs commit: apr/network_io/beos sendrecv.c
Posted by David Reid <dr...@jetnet.co.uk>.
Following wrowe's suggestion I've just tagged these 2 files as
APACHE_2_0_22_dev as they're good changes and get us building on pre-BONE
beos...
I'm also about to commit a change that fixes the make install issue, but
others may want to test it before we declare it fit for inclusion in the
next roll.
david
----- Original Message -----
From: <dr...@apache.org>
To: <ap...@apache.org>
Sent: Friday, July 27, 2001 2:27 AM
Subject: cvs commit: apr/network_io/beos sendrecv.c
> 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 <br...@hotmail.com>
> Reviewed by: David Reid <dr...@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;
>
>
>
>