diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2002-05-31 16:18:38 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2002-05-31 16:18:38 +0000 |
| commit | 4a1b7d4cf0481365c52a97db6f0acf93ad5157c5 (patch) | |
| tree | b13fcc13b249d84f4c3a5eacd861b4a7cb9ed6d7 /file_io | |
| parent | 4b7549a2f0f28de69c3ba90dd0405fbf70462141 (diff) | |
| download | libapr-4a1b7d4cf0481365c52a97db6f0acf93ad5157c5.tar.gz | |
don't use "pipe" as a field name; some platforms redefine
pipe via macro substitution
related to PR: 9457
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63452 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
| -rw-r--r-- | file_io/unix/open.c | 2 | ||||
| -rw-r--r-- | file_io/unix/pipe.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/file_io/unix/open.c b/file_io/unix/open.c index 624b66b71..f887c9a47 100644 --- a/file_io/unix/open.c +++ b/file_io/unix/open.c @@ -171,7 +171,7 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, return errno; } - (*new)->pipe = 0; + (*new)->is_pipe = 0; (*new)->timeout = -1; (*new)->ungetchar = -1; (*new)->eof_hit = 0; diff --git a/file_io/unix/pipe.c b/file_io/unix/pipe.c index dca7b57b8..93745b755 100644 --- a/file_io/unix/pipe.c +++ b/file_io/unix/pipe.c @@ -142,7 +142,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 */ @@ -161,7 +161,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; } @@ -179,7 +179,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out (*in) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t)); (*in)->pool = pool; (*in)->filedes = filedes[0]; - (*in)->pipe = 1; + (*in)->is_pipe = 1; (*in)->fname = NULL; (*in)->buffered = 0; (*in)->blocking = BLK_ON; @@ -192,7 +192,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out (*out) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t)); (*out)->pool = pool; (*out)->filedes = filedes[1]; - (*out)->pipe = 1; + (*out)->is_pipe = 1; (*out)->fname = NULL; (*out)->buffered = 0; (*out)->blocking = BLK_ON; |