From bc2494491d354cfad65e2c7e413d58ec5af1f51b Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 19 Jan 2015 07:39:24 +0000 Subject: [PATCH] replace local MIN() with MINIMUM() --- usr.bin/systat/engine.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/usr.bin/systat/engine.c b/usr.bin/systat/engine.c index 78cabf3bbf0..51c0b7fe4e3 100644 --- a/usr.bin/systat/engine.c +++ b/usr.bin/systat/engine.c @@ -1,4 +1,4 @@ -/* $Id: engine.c,v 1.17 2013/12/02 02:33:41 krw Exp $ */ +/* $Id: engine.c,v 1.18 2015/01/19 07:39:24 deraadt Exp $ */ /* * Copyright (c) 2001, 2007 Can Erkin Acar * @@ -40,9 +40,7 @@ #include "engine.h" -#ifndef MIN -#define MIN(a,b) (((a)<(b))?(a):(b)) -#endif +#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) /* circular linked list of views */ TAILQ_HEAD(view_list, view_ent) view_head = @@ -215,7 +213,7 @@ print_str(int len, const char *str) return; if (rawmode) { - int length = MIN(len, MAX_LINE_BUF - linepos); + int length = MINIMUM(len, MAX_LINE_BUF - linepos); if (length <= 0) return; bcopy(str, &linebuf[linepos], length); -- 2.20.1