Commit 9fa4da1353c98fe4b8b9efcd3e360591dcc0f7a4

Sam Lantinga 2013-11-28T02:31:32

Fixed windows build with conflict resolve

1
2
3
4
5
6
7
8
9
10
11
12
diff --git a/src/video/windows/SDL_windowswindow.h b/src/video/windows/SDL_windowswindow.h
index 52837a1..ed30445 100644
--- a/src/video/windows/SDL_windowswindow.h
+++ b/src/video/windows/SDL_windowswindow.h
@@ -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;