diff options
| author | Patric Stout <truebrain@openttd.org> | 2020-12-05 21:57:47 +0100 |
|---|---|---|
| committer | Patric Stout <github@truebrain.nl> | 2020-12-15 15:46:39 +0100 |
| commit | d15dc9f40f5a20bff452547a2dcb15231f9f969d (patch) | |
| tree | 7b8d88635c048d906cbb6358007fb26055e24410 /src/network/core/address.cpp | |
| parent | 2da07f76154d841bcfe9aaff4833144550186deb (diff) | |
| download | openttd-d15dc9f40f5a20bff452547a2dcb15231f9f969d.tar.xz | |
Add: support for emscripten (play-OpenTTD-in-the-browser)
Emscripten compiles to WASM, which can be loaded via
HTML / JavaScript. This allows you to play OpenTTD inside a
browser.
Co-authored-by: milek7 <me@milek7.pl>
Diffstat (limited to 'src/network/core/address.cpp')
| -rw-r--r-- | src/network/core/address.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/network/core/address.cpp b/src/network/core/address.cpp index c2fecc7ff..1aaa0b5fb 100644 --- a/src/network/core/address.cpp +++ b/src/network/core/address.cpp @@ -299,7 +299,15 @@ static SOCKET ConnectLoopProc(addrinfo *runp) if (!SetNoDelay(sock)) DEBUG(net, 1, "[%s] setting TCP_NODELAY failed", type); - if (connect(sock, runp->ai_addr, (int)runp->ai_addrlen) != 0) { + int err = connect(sock, runp->ai_addr, (int)runp->ai_addrlen); +#ifdef __EMSCRIPTEN__ + /* Emscripten is asynchronous, and as such a connect() is still in + * progress by the time the call returns. */ + if (err != 0 && errno != EINPROGRESS) +#else + if (err != 0) +#endif + { DEBUG(net, 1, "[%s] could not connect %s socket: %s", type, family, strerror(errno)); closesocket(sock); return INVALID_SOCKET; |