[tor-bugs] #4946 [Tor Client]: Tor master (nearly 0.2.3.11-alpha) fails to build on Windows

[Tor Bug Tracker & Wiki]

#4946: Tor master (nearly 0.2.3.11-alpha) fails to build on Windows
------------------------+---------------------------------------------------
 Reporter:  arma        |          Owner:                    
     Type:  defect      |         Status:  new               
 Priority:  major       |      Milestone:  Tor: 0.2.3.x-final
Component:  Tor Client  |        Version:                    
 Keywords:              |         Parent:                    
   Points:              |   Actualpoints:                    
------------------------+---------------------------------------------------

Comment(by arma):

 Sebastian suggests
 {{{
 diff --git a/src/or/dns.c b/src/or/dns.c
 index b74b056..ddf9841 100644
 --- a/src/or/dns.c
 +++ b/src/or/dns.c
 @@ -454,7 +454,7 @@ purge_expired_resolves(time_t now)
          pend = resolve->pending_connections;
          resolve->pending_connections = pend->next;
          /* Connections should only be pending if they have no socket. */
 -        tor_assert(pend->conn->_base.s == TOR_INVALID_SOCKET);
 +        tor_assert(!SOCKET_OK(pend->conn->_base.s));
          pendconn = pend->conn;
          connection_edge_end(pendconn, END_STREAM_REASON_TIMEOUT);
          circuit_detach_stream(circuit_get_by_edge_conn(pendconn),
 pendconn);
 @@ -681,7 +681,7 @@ dns_resolve_impl(edge_connection_t *exitconn, int
 is_resolve,
    uint8_t is_reverse = 0;
    int r;
    assert_connection_ok(TO_CONN(exitconn), 0);
 -  tor_assert(exitconn->_base.s == TOR_INVALID_SOCKET);
 +  tor_assert(!SOCKET_OK(exitconn->_base.s));
    assert_cache_ok();
    tor_assert(oncirc);

 @@ -849,7 +849,7 @@ assert_all_pending_dns_resolves_ok(void)
           pend;
           pend = pend->next) {
        assert_connection_ok(TO_CONN(pend->conn), 0);
 -      tor_assert(pend->conn->_base.s == TOR_INVALID_SOCKET);
 +      tor_assert(!SOCKET_OK(pend->conn->_base.s));
        tor_assert(!connection_in_array(TO_CONN(pend->conn)));
      }
    }
 @@ -955,7 +955,7 @@ dns_cancel_pending_resolve(const char *address)
      pend->conn->_base.state = EXIT_CONN_STATE_RESOLVEFAILED;
      pendconn = pend->conn;
      assert_connection_ok(TO_CONN(pendconn), 0);
 -    tor_assert(pendconn->_base.s == TOR_INVALID_SOCKET);
 +    tor_assert(!SOCKET_OK(pendconn->_base.s));
      if (!pendconn->_base.marked_for_close) {
        connection_edge_end(pendconn, END_STREAM_REASON_RESOLVEFAILED);
      }
 }}}

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/4946#comment:1>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online