From c5808c56db166528ae7e74cedb51cc466f973b9f Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Wed, 9 Sep 2020 16:56:04 +1000 Subject: Consolidate repeated macro definitions into one header The MIN, MAX, CLAMP, MINIMUM, and MAXIMUM macros appear throughout the codebase with many re-definitions. Make a single copy of each in a common header file, and use the BSD variants of MINIMUM/MAXIMUM due to conflicts in the system headers. --- EnvScreen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EnvScreen.c') diff --git a/EnvScreen.c b/EnvScreen.c index fa6ffdcf..479a45d6 100644 --- a/EnvScreen.c +++ b/EnvScreen.c @@ -37,7 +37,7 @@ void EnvScreen_draw(InfoScreen* this) { void EnvScreen_scan(InfoScreen* this) { Panel* panel = this->display; - int idx = MAX(Panel_getSelectedIndex(panel), 0); + int idx = MAXIMUM(Panel_getSelectedIndex(panel), 0); Panel_prune(panel); -- cgit v1.2.3