diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-13 08:49:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 08:49:39 +0100 |
| commit | 55ca2a7c88503d0f07785ab9215809b02027f858 (patch) | |
| tree | dff95ace09acaa882c74f77f1036b05c7e4a360b /platform/windows/os_windows.h | |
| parent | a18ceb6a302b23094136adfc9591121f8b49a8cf (diff) | |
| parent | fe7e11e008598e4bbbe46cf817af2fac999a5326 (diff) | |
Merge pull request #25821 from akien-mga/sync-class-and-filenames
Ensure classes match their header filename
Diffstat (limited to 'platform/windows/os_windows.h')
| -rw-r--r-- | platform/windows/os_windows.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 771789c86b..8ca58b534a 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -30,14 +30,18 @@ #ifndef OS_WINDOWS_H #define OS_WINDOWS_H -#include "context_gl_win.h" + +#include "context_gl_windows.h" #include "core/os/input.h" #include "core/os/os.h" #include "core/project_settings.h" -#include "crash_handler_win.h" +#include "crash_handler_windows.h" #include "drivers/rtaudio/audio_driver_rtaudio.h" +#include "drivers/unix/ip_unix.h" #include "drivers/wasapi/audio_driver_wasapi.h" -#include "drivers/winmidi/win_midi.h" +#include "drivers/winmidi/midi_driver_winmidi.h" +#include "key_mapping_windows.h" +#include "main/input_default.h" #include "power_windows.h" #include "servers/audio_server.h" #include "servers/visual/rasterizer.h" @@ -45,9 +49,6 @@ #ifdef XAUDIO2_ENABLED #include "drivers/xaudio2/audio_driver_xaudio2.h" #endif -#include "drivers/unix/ip_unix.h" -#include "key_mapping_win.h" -#include "main/input_default.h" #include <fcntl.h> #include <io.h> @@ -86,7 +87,7 @@ class OS_Windows : public OS { int old_x, old_y; Point2i center; #if defined(OPENGL_ENABLED) - ContextGL_Win *gl_context; + ContextGL_Windows *gl_context; #endif VisualServer *visual_server; int pressrc; |