Merged from master "Declare "result" as LONG for Mingw build"

This commit is contained in:
Robert Osfield 2020-11-10 15:56:39 +00:00
parent 4ad410969e
commit bf279a59fa

View File

@ -1101,7 +1101,7 @@ bool Win32WindowingSystem::changeScreenSettings( const osg::GraphicsContext::Scr
// Start by testing if the change would be successful (without applying it) // Start by testing if the change would be successful (without applying it)
// //
int result = ::ChangeDisplaySettingsEx(displayDevice.DeviceName, &deviceMode, NULL, CDS_TEST, NULL); LONG result = ::ChangeDisplaySettingsEx(displayDevice.DeviceName, &deviceMode, NULL, CDS_TEST, NULL);
if (result==DISP_CHANGE_SUCCESSFUL) if (result==DISP_CHANGE_SUCCESSFUL)
{ {
result = ::ChangeDisplaySettingsEx(displayDevice.DeviceName, &deviceMode, NULL, 0, NULL); result = ::ChangeDisplaySettingsEx(displayDevice.DeviceName, &deviceMode, NULL, 0, NULL);