cvs commit: apr/include/arch/unix fileio.h

[trawick]

trawick     2002/05/31 09:18:38

  Modified:    file_io/unix open.c pipe.c
               include/arch/unix fileio.h
  Log:
  don't use "pipe" as a field name; some platforms redefine
  pipe via macro substitution
  
  related to PR: 9457
  
  Revision  Changes    Path
  1.96      +1 -1      apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/open.c,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- open.c    17 May 2002 18:05:24 -0000      1.95
  +++ open.c    31 May 2002 16:18:37 -0000      1.96
  @@ -171,7 +171,7 @@
          return errno;
       }
   
  -    (*new)->pipe = 0;
  +    (*new)->is_pipe = 0;
       (*new)->timeout = -1;
       (*new)->ungetchar = -1;
       (*new)->eof_hit = 0;
  
  
  
  1.54      +4 -4      apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/pipe.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- pipe.c    23 May 2002 18:36:08 -0000      1.53
  +++ pipe.c    31 May 2002 16:18:38 -0000      1.54
  @@ -142,7 +142,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 
*/
  @@ -161,7 +161,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;
       }
  @@ -179,7 +179,7 @@
       (*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 @@
       (*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;
  
  
  
  1.41      +1 -1      apr/include/arch/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/fileio.h,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- fileio.h  10 May 2002 03:56:19 -0000      1.40
  +++ fileio.h  31 May 2002 16:18:38 -0000      1.41
  @@ -125,7 +125,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;