summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2015-01-19 07:39:25 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2015-01-19 07:39:25 +0000
commitb46267c544d68a6505df351838cbf4d2a534d4da (patch)
tree0b22a4546fc2b95b26a0af83042f862f57956101
parent9fa28a0355630bbc280758896d937700a9655277 (diff)
replace local MIN() with MINIMUM()
-rw-r--r--usr.bin/systat/engine.c8
1 files 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 <canacar@openbsd.org>
*
@@ -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);