bnicholes 2002/06/03 11:52:46
Modified: file_io/netware pipe.c
include/arch/netware fileio.h
Log:
Updated to match the header change
Revision Changes Path
1.12 +4 -4 apr/file_io/netware/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apr/file_io/netware/pipe.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pipe.c 31 May 2002 17:14:03 -0000 1.11
+++ pipe.c 3 Jun 2002 18:52:45 -0000 1.12
@@ -108,7 +108,7 @@
APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe,
apr_interval_time_t timeout)
{
- if (thepipe->pipe == 1) {
+ if (thepipe->is_pipe == 1) {
thepipe->timeout = timeout;
if (timeout >= 0) {
if (thepipe->blocking != BLK_OFF) { /* blocking or unknown state
*/
@@ -127,7 +127,7 @@
APR_DECLARE(apr_status_t) apr_file_pipe_timeout_get(apr_file_t *thepipe,
apr_interval_time_t *timeout)
{
- if (thepipe->pipe == 1) {
+ if (thepipe->is_pipe == 1) {
*timeout = thepipe->timeout;
return APR_SUCCESS;
}
@@ -150,8 +150,8 @@
(*out)->pool = pool;
(*in)->filedes = filedes[0];
(*out)->filedes = filedes[1];
- (*in)->pipe =
- (*out)->pipe = 1;
+ (*in)->is_pipe =
+ (*out)->is_pipe = 1;
(*out)->fname =
(*in)->fname = NULL;
(*in)->buffered =
1.8 +1 -1 apr/include/arch/netware/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/netware/fileio.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fileio.h 29 May 2002 21:10:57 -0000 1.7
+++ fileio.h 3 Jun 2002 18:52:46 -0000 1.8
@@ -112,7 +112,7 @@
char *fname;
apr_int32_t flags;
int eof_hit;
- int pipe;
+ int is_pipe;
apr_interval_time_t timeout;
int buffered;
enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;