diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-23 22:38:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-23 22:38:33 +0300 |
| commit | c5327f3b1d10171ff2a97546ea49e350b1725c24 (patch) | |
| tree | 2cd1ada4c5db1ad3452bcf7aca9c424c0ed848d2 /src/net/sdltcpnet.cpp | |
| parent | db1e60556c72b1b87ff2a384c556ccca724c46d6 (diff) | |
| parent | 6bed768bc416eed0212b62e70731d2c40cd1b69b (diff) | |
| download | plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.tar.gz plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.tar.bz2 plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.tar.xz plus-c5327f3b1d10171ff2a97546ea49e350b1725c24.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/net/sdltcpnet.cpp')
| -rw-r--r-- | src/net/sdltcpnet.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/net/sdltcpnet.cpp b/src/net/sdltcpnet.cpp index 4ea659ecf..b891ee3e5 100644 --- a/src/net/sdltcpnet.cpp +++ b/src/net/sdltcpnet.cpp @@ -89,6 +89,7 @@ int TcpNet::resolveHost(IPaddress *const address, const char *const host, TcpNet::Socket TcpNet::open(IPaddress *const ip) { const TcpNet::Socket sock = SDLNet_TCP_Open(ip); +#ifndef __native_client__ if (sock && ip) { const TCPsocketHack *const hack @@ -118,6 +119,7 @@ TcpNet::Socket TcpNet::open(IPaddress *const ip) } } } +#endif return sock; } |