diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-18 09:23:43 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-18 09:23:43 -0600 |
| commit | 1dcb6863254f41a606b0d878b8cd2eeafe060e73 (patch) | |
| tree | 6901c84cc442577be26f98855029e74a579eb0b2 /platform | |
| parent | 8811b39968c2d283e6f61bcbda86a2e455911095 (diff) | |
| parent | 168a2a14668b6a26446bc152d58b2e16f467fe0e (diff) | |
| download | redot-engine-1dcb6863254f41a606b0d878b8cd2eeafe060e73.tar.gz | |
Merge pull request #99026 from Faless/net/split_ip
[Net] Split Unix/Windows IP implementation
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/display_server_windows.h | 1 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 3 | ||||
| -rw-r--r-- | platform/windows/os_windows.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h index 0462d3f8fa..32ed8823d3 100644 --- a/platform/windows/display_server_windows.h +++ b/platform/windows/display_server_windows.h @@ -40,7 +40,6 @@ #include "core/input/input.h" #include "core/io/image.h" #include "core/os/os.h" -#include "drivers/unix/ip_unix.h" #include "drivers/wasapi/audio_driver_wasapi.h" #include "drivers/winmidi/midi_driver_winmidi.h" #include "servers/audio_server.h" diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 6423af9509..416016b112 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -43,6 +43,7 @@ #include "drivers/windows/dir_access_windows.h" #include "drivers/windows/file_access_windows.h" #include "drivers/windows/file_access_windows_pipe.h" +#include "drivers/windows/ip_windows.h" #include "drivers/windows/net_socket_winsock.h" #include "main/main.h" #include "servers/audio_server.h" @@ -275,7 +276,7 @@ void OS_Windows::initialize() { current_pi.pi.hProcess = GetCurrentProcess(); process_map->insert(GetCurrentProcessId(), current_pi); - IPUnix::make_default(); + IPWindows::make_default(); main_loop = nullptr; HRESULT hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), reinterpret_cast<IUnknown **>(&dwrite_factory)); diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index a32e535f0b..fd98f9b14b 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -37,7 +37,6 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/os/os.h" -#include "drivers/unix/ip_unix.h" #include "drivers/wasapi/audio_driver_wasapi.h" #include "drivers/winmidi/midi_driver_winmidi.h" #include "servers/audio_server.h" |