summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--file_io/netware/pipe.c8
-rw-r--r--include/arch/netware/fileio.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/file_io/netware/pipe.c b/file_io/netware/pipe.c
index dc1b62457..47c864894 100644
--- a/file_io/netware/pipe.c
+++ b/file_io/netware/pipe.c
@@ -108,7 +108,7 @@ static apr_status_t pipenonblock(apr_file_t *thepipe)
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_set(apr_file_t *thepipe, apr_int
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 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out
(*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 =
diff --git a/include/arch/netware/fileio.h b/include/arch/netware/fileio.h
index 62db86e5e..e5234d476 100644
--- a/include/arch/netware/fileio.h
+++ b/include/arch/netware/fileio.h
@@ -112,7 +112,7 @@ struct apr_file_t {
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;