Fixed windows build with conflict resolve
authorSam Lantinga <slouken@libsdl.org>
Thu, 28 Nov 2013 02:31:32 -0800
changeset 8038e1f2a85d9dda
parent 8037 61f20fd1d1bf
child 8039 3b0346b37e0f
child 8543 b9dd3cf38585
Fixed windows build with conflict resolve
src/video/windows/SDL_windowswindow.h
     1.1 --- a/src/video/windows/SDL_windowswindow.h	Wed Nov 27 10:29:43 2013 -0800
     1.2 +++ b/src/video/windows/SDL_windowswindow.h	Thu Nov 28 02:31:32 2013 -0800
     1.3 @@ -38,6 +38,7 @@
     1.4      SDL_bool created;
     1.5      WPARAM mouse_button_flags;
     1.6      BOOL expected_resize;
     1.7 +    SDL_bool in_modal_loop;
     1.8      struct SDL_VideoData *videodata;
     1.9  #if SDL_VIDEO_OPENGL_EGL  
    1.10      EGLSurface egl_surface;