From 0fafc07db0acaf8c1931157e2ce3130ce6fa3e68 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 11 Jun 2019 15:30:50 +0530 Subject: [PATCH] Fix #1702 --- glfw/ibus_glfw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glfw/ibus_glfw.c b/glfw/ibus_glfw.c index 9febccac1..a21b3a5c3 100644 --- a/glfw/ibus_glfw.c +++ b/glfw/ibus_glfw.c @@ -57,7 +57,7 @@ test_env_var(const char *name, const char *val) { } static inline size_t -MIN(size_t a, size_t b) { +GLFW_MIN(size_t a, size_t b) { return a < b ? a : b; } @@ -151,7 +151,7 @@ get_ibus_address_file_name(void) { addr = getenv("IBUS_ADDRESS"); int offset = 0; if (addr && addr[0]) { - memcpy(ans, addr, MIN(strlen(addr), sizeof(ans))); + memcpy(ans, addr, GLFW_MIN(strlen(addr), sizeof(ans))); return ans; }