Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Code Issues Releases Activity

Use std::min instead of the MIN macro

Browse Source
This commit is contained in:
Pavel Labath 2010-11-12 20:08:34 +01:00
parent d899f603d3
commit 758c2ed674
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/llua.cc
View File

@ -42,8 +42,6 @@ void llua_rm_notifies(void);
static int llua_block_notify = 0; static int llua_block_notify = 0;
#endif /* HAVE_SYS_INOTIFY_H */ #endif /* HAVE_SYS_INOTIFY_H */
#define MIN(a, b) ( (a) < (b) ? (a) : (b) )
static char *draw_pre_hook = 0; static char *draw_pre_hook = 0;
static char *draw_post_hook = 0; static char *draw_post_hook = 0;
static char *startup_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); snprintf(func, sizeof func, "%s", LUAPREFIX);
} else } else
*func = 0; *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 */ /* push the function name to stack */
lua_getglobal(lua_L, func); lua_getglobal(lua_L, func);