Win32 display enum nomenclature fix.

This commit is contained in:
Camilla Berglund 2013-02-12 13:43:47 +01:00
parent 823022fdb2
commit c9167ce233

View File

@ -107,7 +107,7 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
{ {
// Enumerate display adapters // Enumerate display adapters
DISPLAY_DEVICE adapter, monitor; DISPLAY_DEVICE adapter, display;
DEVMODE settings; DEVMODE settings;
char* name; char* name;
HDC dc; HDC dc;
@ -150,15 +150,15 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
} }
} }
ZeroMemory(&monitor, sizeof(DISPLAY_DEVICE)); ZeroMemory(&display, sizeof(DISPLAY_DEVICE));
monitor.cb = sizeof(DISPLAY_DEVICE); display.cb = sizeof(DISPLAY_DEVICE);
EnumDisplayDevices(adapter.DeviceName, 0, &monitor, 0); EnumDisplayDevices(adapter.DeviceName, 0, &display, 0);
dc = CreateDC(L"DISPLAY", monitor.DeviceString, NULL, NULL); dc = CreateDC(L"DISPLAY", display.DeviceString, NULL, NULL);
primary = adapter.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE; primary = adapter.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE;
name = _glfwCreateUTF8FromWideString(monitor.DeviceString); name = _glfwCreateUTF8FromWideString(display.DeviceString);
if (!name) if (!name)
{ {
// TODO: wat // TODO: wat