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/arch/win32 networkio.h
Date Mon, 15 Jul 2002 06:15:00 GMT
wrowe       2002/07/14 23:15:00

  Modified:    include/arch/win32 networkio.h
  Log:
    Win32 has several bugs ... mostly from unix accessors, when timeout is
    presumed to be in apr time (but we've stored ms.)  Keep timeout in pure
    apr time for the benefit of accessors and common win32/unix code, and
    store a new timeout_ms field, updated whenever timeout is set to > 0.
  
  Revision  Changes    Path
  1.27      +11 -10    apr/include/arch/win32/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/win32/networkio.h,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- networkio.h	11 Jul 2002 06:22:22 -0000	1.26
  +++ networkio.h	15 Jul 2002 06:15:00 -0000	1.27
  @@ -62,17 +62,18 @@
   #define socketdes sock
   
   struct apr_socket_t {
  -    apr_pool_t *cntxt;
  -    SOCKET sock;
  -    int type; /* SOCK_STREAM, SOCK_DGRAM */
  -    apr_sockaddr_t *local_addr;
  -    apr_sockaddr_t *remote_addr;
  +    apr_pool_t         *cntxt;
  +    SOCKET              sock;
  +    int                 type; /* SOCK_STREAM, SOCK_DGRAM */
  +    apr_sockaddr_t     *local_addr;
  +    apr_sockaddr_t     *remote_addr;
  +    int                 timeout_ms; /* MUST MATCH if timeout > 0 */
       apr_interval_time_t timeout;
  -    apr_int32_t disconnected;
  -    int local_port_unknown;
  -    int local_interface_unknown;
  -    apr_int32_t netmask;
  -    apr_int32_t inherit;
  +    apr_int32_t         disconnected;
  +    int                 local_port_unknown;
  +    int                 local_interface_unknown;
  +    apr_int32_t         netmask;
  +    apr_int32_t         inherit;
   };
   
   #ifdef _WIN32_WCE
  
  
  

Mime
View raw message