From 758c2ed6748374d2fa4676c1ee2c8a6a5df6138e Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Fri, 12 Nov 2010 20:08:34 +0100 Subject: [PATCH] Use std::min instead of the MIN macro --- src/llua.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/llua.cc b/src/llua.cc index 13c9b50f..f713a98a 100644 --- a/src/llua.cc +++ b/src/llua.cc @@ -42,8 +42,6 @@ void llua_rm_notifies(void); static int llua_block_notify = 0; #endif /* HAVE_SYS_INOTIFY_H */ -#define MIN(a, b) ( (a) < (b) ? (a) : (b) ) - static char *draw_pre_hook = 0; static char *draw_post_hook = 0; static char *startup_hook = 0; @@ -210,7 +208,7 @@ static char *llua_do_call(const char *string, int retc) snprintf(func, sizeof func, "%s", LUAPREFIX); } else *func = 0; - strncat(func, ptr, MIN(len, sizeof(func) - strlen(func) - 1)); + strncat(func, ptr, std::min(len, sizeof(func) - strlen(func) - 1)); /* push the function name to stack */ lua_getglobal(lua_L, func);