Synching VC14 and VC15, fixed some (more) warnings.

This commit is contained in:
waltje
2018-04-25 18:24:37 -04:00
parent 44223a36b4
commit c190810fcf
7 changed files with 32 additions and 22 deletions

View File

@@ -11,7 +11,7 @@
* NOTES: This code should be re-merged into a single init() with a
* 'fullscreen' argument, indicating FS mode is requested.
*
* Version: @(#)win_ddraw.cpp 1.0.4 2018/04/14
* Version: @(#)win_ddraw.cpp 1.0.5 2018/04/25
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -50,6 +50,9 @@
#endif
#include "../emu.h"
#include "../device.h"
#ifdef _MSC_VER
# pragma warning(disable: 4200)
#endif
#include "../video/video.h"
#include "../plat.h"
#include "../ui.h"