Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5756d887 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 87d0f45b: am 2dea56e0: am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures." 

* commit '87d0f45b':
  Fix Windows socket_network_client.c build failures.
parents 3edc2527 87d0f45b

libcutils/socket_network_client.c

+8 −1
Original line number Diff line number Diff line
@@ -68,6 +68,13 @@ int socket_network_client_timeout(const char *host, int port, int type, int time 
    s = socket(hp->h_addrtype, type, 0);

    if (s < 0) return -1;



#ifdef HAVE_WINSOCK

    if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {

        close(s);

        return -1;

    }

    return s;

#else

    if ((flags = fcntl(s, F_GETFL, 0)) < 0) {

        close(s);

        return -1;
@@ -125,5 +132,5 @@ done: 
    }



    return s;

#endif

}