From bf279a59fab4c51a21a28b47de496cdebd53f0c4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 10 Nov 2020 15:56:39 +0000 Subject: [PATCH] Merged from master "Declare "result" as LONG for Mingw build" --- src/osgViewer/GraphicsWindowWin32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp index e895f98f7..f1f3bf628 100644 --- a/src/osgViewer/GraphicsWindowWin32.cpp +++ b/src/osgViewer/GraphicsWindowWin32.cpp @@ -1101,7 +1101,7 @@ bool Win32WindowingSystem::changeScreenSettings( const osg::GraphicsContext::Scr // 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) { result = ::ChangeDisplaySettingsEx(displayDevice.DeviceName, &deviceMode, NULL, 0, NULL);