cvs commit: apr/network_io/win32 sockets.c

[bnicholes]

bnicholes    2004/07/26 16:11:17

  Modified:    include/arch/win32 apr_arch_networkio.h
               network_io/win32 sockets.c
  Log:
  Since this code only applies to sendfile, make sure that it is properly 
#ifdef'ed
  
  Revision  Changes    Path
  1.8       +2 -0      apr/include/arch/win32/apr_arch_networkio.h
  
  Index: apr_arch_networkio.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/win32/apr_arch_networkio.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_arch_networkio.h      22 Jul 2004 01:48:34 -0000      1.7
  +++ apr_arch_networkio.h      26 Jul 2004 23:11:17 -0000      1.8
  @@ -42,11 +42,13 @@
       int                 remote_addr_unknown;
       apr_int32_t         options;
       apr_int32_t         inherit;
  +#if APR_HAS_SENDFILE
       /* As of 07.20.04, the overlapped structure is only used by 
        * apr_socket_sendfile and that's where it will be allocated 
        * and initialized.
        */
       OVERLAPPED         *overlapped;
  +#endif
       sock_userdata_t    *userdata;
   
       /* if there is a timeout set, then this pollset is used */
  
  
  
  1.107     +2 -0      apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- sockets.c 22 Jul 2004 01:48:35 -0000      1.106
  +++ sockets.c 26 Jul 2004 23:11:17 -0000      1.107
  @@ -35,10 +35,12 @@
           }
           thesocket->socketdes = INVALID_SOCKET;
       }
  +#if APR_HAS_SENDFILE
       if (thesocket->overlapped) {
           CloseHandle(thesocket->overlapped->hEvent);
           thesocket->overlapped = NULL;
       }
  +#endif
       return APR_SUCCESS;
   }