From 7cb6b245e86bdab44bcef37915f77fa8869d8e1d Mon Sep 17 00:00:00 2001 From: Jon Morton Date: Fri, 4 Jan 2013 19:14:27 -0600 Subject: [PATCH] Fix invalid variable declarations in win32_monitor.c This fixes build errors in visual studio on windows. --- src/win32_monitor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/win32_monitor.c b/src/win32_monitor.c index 7b0d3925..b23dcd5a 100644 --- a/src/win32_monitor.c +++ b/src/win32_monitor.c @@ -56,6 +56,7 @@ int _glfwSetVideoMode(_GLFWmonitor* monitor, const GLFWvidmode* mode) { GLFWvidmode current; const GLFWvidmode* best; + DEVMODE dm; best = _glfwChooseVideoMode(monitor, mode); @@ -63,7 +64,6 @@ int _glfwSetVideoMode(_GLFWmonitor* monitor, const GLFWvidmode* mode) if (_glfwCompareVideoModes(¤t, best) == 0) return GL_TRUE; - DEVMODE dm; dm.dmSize = sizeof(DEVMODE); dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL; dm.dmPelsWidth = best->width; @@ -120,6 +120,7 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count) DEVMODE settings; char* name; HDC dc; + GLboolean primary; ZeroMemory(&adapter, sizeof(DISPLAY_DEVICE)); adapter.cb = sizeof(DISPLAY_DEVICE); @@ -171,7 +172,7 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count) EnumDisplayDevices(adapter.DeviceName, 0, &monitor, 0); dc = CreateDC(L"DISPLAY", monitor.DeviceString, NULL, NULL); - const GLboolean primary = adapter.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE; + primary = adapter.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE; monitors[found] = _glfwCreateMonitor(name, primary, GetDeviceCaps(dc, HORZSIZE),