From c9167ce23379f2f42a036b4f5088b63d0694d6e5 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Tue, 12 Feb 2013 13:43:47 +0100 Subject: [PATCH] Win32 display enum nomenclature fix. --- src/win32_monitor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/win32_monitor.c b/src/win32_monitor.c index 27d394dd..f49af247 100644 --- a/src/win32_monitor.c +++ b/src/win32_monitor.c @@ -107,7 +107,7 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count) { // Enumerate display adapters - DISPLAY_DEVICE adapter, monitor; + DISPLAY_DEVICE adapter, display; DEVMODE settings; char* name; HDC dc; @@ -150,15 +150,15 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count) } } - ZeroMemory(&monitor, sizeof(DISPLAY_DEVICE)); - monitor.cb = sizeof(DISPLAY_DEVICE); + ZeroMemory(&display, sizeof(DISPLAY_DEVICE)); + display.cb = sizeof(DISPLAY_DEVICE); - EnumDisplayDevices(adapter.DeviceName, 0, &monitor, 0); - dc = CreateDC(L"DISPLAY", monitor.DeviceString, NULL, NULL); + EnumDisplayDevices(adapter.DeviceName, 0, &display, 0); + dc = CreateDC(L"DISPLAY", display.DeviceString, NULL, NULL); primary = adapter.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE; - name = _glfwCreateUTF8FromWideString(monitor.DeviceString); + name = _glfwCreateUTF8FromWideString(display.DeviceString); if (!name) { // TODO: wat