From f6defeff5d4d865862c0bbfd8fa2b5c4d2fa1d7c Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Fri, 31 Jul 2015 14:01:33 +0200 Subject: [PATCH] Remove C++-isms in Mir port Related to #568. --- src/mir_monitor.c | 2 +- src/mir_window.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mir_monitor.c b/src/mir_monitor.c index f5fa0e98..b0683539 100644 --- a/src/mir_monitor.c +++ b/src/mir_monitor.c @@ -86,7 +86,7 @@ void _glfwPlatformGetMonitorPos(_GLFWmonitor* monitor, int* xpos, int* ypos) *ypos = monitor->mir.y; } -void FillInRGBBitsFromPixelFormat(GLFWvidmode* mode, MirPixelFormat const pf) +void FillInRGBBitsFromPixelFormat(GLFWvidmode* mode, const MirPixelFormat pf) { switch (pf) { diff --git a/src/mir_window.c b/src/mir_window.c index 53c21a64..3d08f6af 100644 --- a/src/mir_window.c +++ b/src/mir_window.c @@ -702,7 +702,7 @@ int _glfwPlatformCreateCursor(_GLFWcursor* cursor, return GL_TRUE; } -char const* getSystemCursorName(int shape) +const char* getSystemCursorName(int shape) { switch (shape) { @@ -725,7 +725,7 @@ char const* getSystemCursorName(int shape) int _glfwPlatformCreateStandardCursor(_GLFWcursor* cursor, int shape) { - char const* cursor_name = getSystemCursorName(shape); + const char* cursor_name = getSystemCursorName(shape); if (cursor_name) {