Fixed windows build with conflict resolve
authorSam Lantinga <slouken@libsdl.org>
Thu, 28 Nov 2013 02:31:32 -0800
changeset 8038 e1f2a85d9dda
parent 8037 61f20fd1d1bf
child 8039 3b0346b37e0f
child 8543 b9dd3cf38585
Fixed windows build with conflict resolve
src/video/windows/SDL_windowswindow.h
--- a/src/video/windows/SDL_windowswindow.h	Wed Nov 27 10:29:43 2013 -0800
+++ b/src/video/windows/SDL_windowswindow.h	Thu Nov 28 02:31:32 2013 -0800
@@ -38,6 +38,7 @@
     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;