diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-09-02 05:32:12 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-09-12 15:56:16 +0200 |
| commit | 1b99806b478b823ff04ad0e2538e211e55c037cb (patch) | |
| tree | 3fecd85237e8883234d4af124cf9f3cb9d350f26 /platform/windows/os_windows.cpp | |
| parent | b4e3be7519d576cd341da5c8b36cd44ab4e13c45 (diff) | |
Unify PacketPeerUDP using NetSocket
Diffstat (limited to 'platform/windows/os_windows.cpp')
| -rw-r--r-- | platform/windows/os_windows.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index ef6c4c21eb..580ec37fa4 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -28,6 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +// Must include Winsock before windows.h (included by os_windows.h) +#include "drivers/unix/net_socket_posix.h" + #include "os_windows.h" #include "core/io/marshalls.h" @@ -37,7 +40,6 @@ #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" @@ -219,9 +221,9 @@ void OS_Windows::initialize_core() { DirAccess::make_default<DirAccessWindows>(DirAccess::ACCESS_USERDATA); DirAccess::make_default<DirAccessWindows>(DirAccess::ACCESS_FILESYSTEM); + NetSocketPosix::make_default(); TCPServerWinsock::make_default(); StreamPeerTCPWinsock::make_default(); - PacketPeerUDPWinsock::make_default(); // We need to know how often the clock is updated if (!QueryPerformanceFrequency((LARGE_INTEGER *)&ticks_per_second)) |