From f29f6b1e77808b36722014fe3c1754d1f5ac3562 Mon Sep 17 00:00:00 2001 From: Nelson Ferreira Date: Sun, 6 Dec 2015 16:52:42 -0500 Subject: [PATCH] Use proper max in lwlib * src/ui/lwlib/lwlib.c: Undefine max macro to use this type safe alternative. Signed-off-by: Nelson Ferreira --- src/ui/lwlib/lwlib.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ui/lwlib/lwlib.c b/src/ui/lwlib/lwlib.c index 7748709..b23e76d 100644 --- a/src/ui/lwlib/lwlib.c +++ b/src/ui/lwlib/lwlib.c @@ -500,6 +500,12 @@ static Boolean safe_strcmp(const char *s1, const char *s2) return (s1 && s2) ? strcmp(s1, s2) : s1 ? False : !!s2; } + +/* We only expect to use the following max function */ +#ifdef max +#undef max +#endif + static change_type max(change_type i1, change_type i2) { return (int)i1 > (int)i2 ? i1 : i2; -- 2.25.1