diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-09-12 18:25:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 18:25:28 +0200 |
| commit | cdc5264a3ef08c0e6805eb38d3f632ca21a5171e (patch) | |
| tree | 12acf768a03838ee4721c1ededd2abd2f2793fca /drivers/unix/os_unix.cpp | |
| parent | 06667b2fcfcf130a9b9e8974c1c7ac0c9ae1de0a (diff) | |
| parent | 30327872e0d7989220a28a91a39d847dacca406d (diff) | |
Merge pull request #21692 from Faless/sockets_rebase
New NetSocket interface with common BSD/Win implementation
Diffstat (limited to 'drivers/unix/os_unix.cpp')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 6dba6923c3..1225d00aad 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -37,11 +37,9 @@ #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" #include "drivers/unix/mutex_posix.h" -#include "drivers/unix/packet_peer_udp_posix.h" +#include "drivers/unix/net_socket_posix.h" #include "drivers/unix/rw_lock_posix.h" #include "drivers/unix/semaphore_posix.h" -#include "drivers/unix/stream_peer_tcp_posix.h" -#include "drivers/unix/tcp_server_posix.h" #include "drivers/unix/thread_posix.h" #include "servers/visual_server.h" @@ -124,9 +122,7 @@ void OS_Unix::initialize_core() { DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_FILESYSTEM); #ifndef NO_NETWORK - TCPServerPosix::make_default(); - StreamPeerTCPPosix::make_default(); - PacketPeerUDPPosix::make_default(); + NetSocketPosix::make_default(); IP_Unix::make_default(); #endif |