apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/include apr.hnw apr.hw
Date Fri, 02 Aug 2002 19:56:08 GMT
wrowe       2002/08/02 12:56:08

  Modified:    poll/unix poll.c
               include  apr.hnw apr.hw
  Log:
    Features, not platforms, correct?
  
  Revision  Changes    Path
  1.21      +6 -6      apr/poll/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apr/poll/unix/poll.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- poll.c	2 Aug 2002 19:48:49 -0000	1.20
  +++ poll.c	2 Aug 2002 19:56:08 -0000	1.21
  @@ -209,14 +209,14 @@
               fd = aprset[i].desc.s->socketdes;
           }
           else {
  -#ifdef WIN32
  +#if !APR_FILES_AS_SOCKETS
               return APR_EBADF;
   #else
               fd = aprset[i].desc.f->filedes;
   #ifdef NETWARE
               is_pipe = aprset[i].desc.f->is_pipe;
   #endif /* NETWARE */
  -#endif /* !WIN32 */
  +#endif /* APR_FILES_AS_SOCKETS */
           }
           if (aprset[i].reqevents & APR_POLLIN) {
               FD_SET(fd, &readset);
  @@ -261,7 +261,7 @@
               fd = aprset[i].desc.s->socketdes;
           }
           else {
  -#ifdef WIN32
  +#if !APR_FILES_AS_SOCKETS
               return APR_EBADF;
   #else
               fd = aprset[i].desc.f->filedes;
  @@ -355,7 +355,7 @@
           fd = descriptor->desc.s->socketdes;
       }
       else {
  -#ifdef WIN32
  +#if !APR_FILES_AS_SOCKETS
           return APR_EBADF;
   #else
           fd = descriptor->desc.f->filedes;
  @@ -412,7 +412,7 @@
           fd = descriptor->desc.s->socketdes;
       }
       else {
  -#ifdef WIN32
  +#if !APR_FILES_AS_SOCKETS
           return APR_EBADF;
   #else
           fd = descriptor->desc.f->filedes;
  @@ -521,7 +521,7 @@
               fd = pollset->query_set[i].desc.s->socketdes;
           }
           else {
  -#ifdef WIN32
  +#if !APR_FILES_AS_SOCKETS
               return APR_EBADF;
   #else
               fd = pollset->query_set[i].desc.f->filedes;
  
  
  
  1.20      +4 -0      apr/include/apr.hnw
  
  Index: apr.hnw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hnw,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- apr.hnw	29 Jul 2002 22:30:52 -0000	1.19
  +++ apr.hnw	2 Aug 2002 19:56:08 -0000	1.20
  @@ -212,6 +212,10 @@
   #define APR_HAS_XTHREAD_FILES     0
   #define APR_HAS_OS_UUID           0
   
  +/* Netware can poll on files/pipes.
  + */
  +#define APR_FILES_AS_SOCKETS      1
  +
   /* Not all platforms have a real INADDR_NONE.  This macro replaces INADDR_NONE
    * on all platforms.
    */
  
  
  
  1.98      +4 -0      apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hw,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- apr.hw	17 Jul 2002 05:15:17 -0000	1.97
  +++ apr.hw	2 Aug 2002 19:56:08 -0000	1.98
  @@ -299,6 +299,10 @@
   #endif
   #define APR_HAS_OS_UUID           1
   
  +/* Win32 cannot poll [just yet] on files/pipes.
  + */
  +#define APR_FILES_AS_SOCKETS      0
  +
   /* Not all platforms have a real INADDR_NONE.  This macro replaces INADDR_NONE
    * on all platforms.
    */
  
  
  

Mime
View raw message