gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 02:38:52 -05:00
Code Issues Projects Releases Wiki Activity

Fix invalid variable declarations in win32_monitor.c

Browse Source 
This fixes build errors in visual studio on windows.
This commit is contained in:
Jon Morton 2013-01-04 19:14:27 -06:00
parent b35855cfb5
commit 7cb6b245e8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/win32_monitor.c
View File

@ -56,6 +56,7 @@ int _glfwSetVideoMode(_GLFWmonitor* monitor, const GLFWvidmode* mode)
{ {
GLFWvidmode current; GLFWvidmode current;
const GLFWvidmode* best; const GLFWvidmode* best;
DEVMODE dm;
best = _glfwChooseVideoMode(monitor, mode); best = _glfwChooseVideoMode(monitor, mode);
@ -63,7 +64,6 @@ int _glfwSetVideoMode(_GLFWmonitor* monitor, const GLFWvidmode* mode)
if (_glfwCompareVideoModes(&current, best) == 0) if (_glfwCompareVideoModes(&current, best) == 0)
return GL_TRUE; return GL_TRUE;
DEVMODE dm;
dm.dmSize = sizeof(DEVMODE); dm.dmSize = sizeof(DEVMODE);
dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL; dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL;
dm.dmPelsWidth = best->width; dm.dmPelsWidth = best->width;
@ -120,6 +120,7 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
DEVMODE settings; DEVMODE settings;
char* name; char* name;
HDC dc; HDC dc;
GLboolean primary;
ZeroMemory(&adapter, sizeof(DISPLAY_DEVICE)); ZeroMemory(&adapter, sizeof(DISPLAY_DEVICE));
adapter.cb = sizeof(DISPLAY_DEVICE); adapter.cb = sizeof(DISPLAY_DEVICE);
@ -171,7 +172,7 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
EnumDisplayDevices(adapter.DeviceName, 0, &monitor, 0); EnumDisplayDevices(adapter.DeviceName, 0, &monitor, 0);
dc = CreateDC(L"DISPLAY", monitor.DeviceString, NULL, NULL); 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, monitors[found] = _glfwCreateMonitor(name, primary,
GetDeviceCaps(dc, HORZSIZE), GetDeviceCaps(dc, HORZSIZE),