Merge remote-tracking branch 'bpay/clang-cl-build-fixes' into development

Conflicts:
	Engine/source/T3D/shapeBase.h
This commit is contained in:
Daniel Buckmaster 2015-07-17 16:55:12 +10:00
commit c2e5dc3345
17 changed files with 40 additions and 27 deletions

View file

@ -502,8 +502,8 @@ void Win32WindowManager::lowerCurtain()
// Get the monitor's extents.
MONITORINFO monInfo;
dMemset(&monInfo, 0, sizeof MONITORINFO);
monInfo.cbSize = sizeof MONITORINFO;
dMemset(&monInfo, 0, sizeof(MONITORINFO));
monInfo.cbSize = sizeof(MONITORINFO);
GetMonitorInfo(hMon, &monInfo);