cvs commit: apr/poll/unix poll.c

[ianh]

ianh        2002/08/01 21:53:47

  Modified:    poll/unix poll.c
  Log:
  c/unsigned int/SOCKET/ for win32
  
  Revision  Changes    Path
  1.13      +20 -0     apr/poll/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apr/poll/unix/poll.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- poll.c    2 Aug 2002 01:13:49 -0000       1.12
  +++ poll.c    2 Aug 2002 04:53:47 -0000       1.13
  @@ -187,7 +187,11 @@
       FD_ZERO(&exceptset);
   
       for (i = 0; i < num; i++) {
  +#ifdef WIN32
  +        SOCKET fd;
  +#else
           int fd;
  +#endif
   
           if (aprset[i].desc_type == APR_POLL_SOCKET) {
               fd = aprset[i].desc.s->socketdes;
  @@ -235,7 +239,11 @@
       }
   
       for (i = 0; i < num; i++) {
  +#ifdef WIN32
  +        SOCKET fd;
  +#else
           int fd;
  +#endif
   
           if (aprset[i].desc_type == APR_POLL_SOCKET) {
               fd = aprset[i].desc.s->socketdes;
  @@ -308,8 +316,12 @@
                                             const apr_pollfd_t *descriptor)
   {
   #ifndef HAVE_POLL
  +#ifdef WIN32
  +    SOCKET fd;
  +#else
       int fd;
   #endif
  +#endif
   
       if (pollset->nelts == pollset->nalloc) {
           return APR_ENOMEM;
  @@ -356,8 +368,12 @@
   {
       apr_uint32_t i;
   #ifndef HAVE_POLL
  +#ifdef WIN32
  +    SOCKET fd;
  +#else
       int fd;
   #endif
  +#endif
   
   #ifdef HAVE_POLL
       for (i = 0; i < pollset->nelts; i++) {
  @@ -484,7 +500,11 @@
       }
       j = 0;
       for (i = 0; i < pollset->nelts; i++) {
  +#ifdef WIN32
  +        SOCKET fd;
  +#else
           int fd;
  +#endif
           if (pollset->query_set[i].desc_type == APR_POLL_SOCKET) {
               fd = pollset->query_set[i].desc.s->socketdes;
           }