Fixed windows build with conflict resolve

This commit is contained in:
Sam Lantinga 2013-11-28 02:31:32 -08:00
parent dee481350c
commit 9fa4da1353

View File

@ -38,6 +38,7 @@ typedef struct
SDL_bool created;
WPARAM mouse_button_flags;
BOOL expected_resize;
SDL_bool in_modal_loop;
struct SDL_VideoData *videodata;
#if SDL_VIDEO_OPENGL_EGL
EGLSurface egl_surface;