From 94ea4e20bb0f9f593c942894c1e682b874d1821e Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 28 Nov 2013 02:31:32 -0800
Subject: [PATCH] Fixed windows build with conflict resolve

---
 src/video/windows/SDL_windowswindow.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/video/windows/SDL_windowswindow.h b/src/video/windows/SDL_windowswindow.h
index 52837a17a..ed304453c 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;