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 /platform/uwp/os_uwp.cpp | |
| parent | 06667b2fcfcf130a9b9e8974c1c7ac0c9ae1de0a (diff) | |
| parent | 30327872e0d7989220a28a91a39d847dacca406d (diff) | |
| download | redot-engine-cdc5264a3ef08c0e6805eb38d3f632ca21a5171e.tar.gz | |
Merge pull request #21692 from Faless/sockets_rebase
New NetSocket interface with common BSD/Win implementation
Diffstat (limited to 'platform/uwp/os_uwp.cpp')
| -rw-r--r-- | platform/uwp/os_uwp.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp index df444c1eb7..5b5f30244e 100644 --- a/platform/uwp/os_uwp.cpp +++ b/platform/uwp/os_uwp.cpp @@ -28,6 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +// Must include Winsock before windows.h (included by os_uwp.h) +#include "drivers/unix/net_socket_posix.h" + #include "os_uwp.h" #include "core/io/marshalls.h" @@ -38,11 +41,8 @@ #include "drivers/windows/dir_access_windows.h" #include "drivers/windows/file_access_windows.h" #include "drivers/windows/mutex_windows.h" -#include "drivers/windows/packet_peer_udp_winsock.h" #include "drivers/windows/rw_lock_windows.h" #include "drivers/windows/semaphore_windows.h" -#include "drivers/windows/stream_peer_tcp_winsock.h" -#include "drivers/windows/tcp_server_winsock.h" #include "main/main.h" #include "platform/windows/windows_terminal_logger.h" #include "servers/audio_server.h" @@ -151,9 +151,7 @@ void OSUWP::initialize_core() { DirAccess::make_default<DirAccessWindows>(DirAccess::ACCESS_USERDATA); DirAccess::make_default<DirAccessWindows>(DirAccess::ACCESS_FILESYSTEM); - TCPServerWinsock::make_default(); - StreamPeerTCPWinsock::make_default(); - PacketPeerUDPWinsock::make_default(); + NetSocketPosix::make_default(); // We need to know how often the clock is updated if (!QueryPerformanceFrequency((LARGE_INTEGER *)&ticks_per_second)) |