===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/vmstat.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- src/usr.bin/systat/vmstat.c	2014/11/23 04:34:48	1.78
+++ src/usr.bin/systat/vmstat.c	2015/01/16 00:03:38	1.79
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmstat.c,v 1.78 2014/11/23 04:34:48 guenther Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.79 2015/01/16 00:03:38 deraadt Exp $	*/
 /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
 
 /*-
@@ -34,7 +34,8 @@
  * Cursed vmstat -- from Robert Elz.
  */
 
-#include <sys/param.h>
+#include <sys/param.h>	/* MAXCOMLEN */
+#include <sys/types.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/sched.h>
@@ -53,7 +54,10 @@
 #include <unistd.h>
 
 #include "systat.h"
+#include "dkstats.h"
 
+#define MAXIMUM(a, b)	(((a) > (b)) ? (a) : (b))
+
 static struct Info {
 	long	time[CPUSTATES];
 	struct	uvmexp uvmexp;
@@ -63,7 +67,6 @@
 	u_quad_t *intrcnt;
 } s, s1, s2, s3, z;
 
-#include "dkstats.h"
 extern struct _disk	cur;
 
 #define	cnt s.Cnt
@@ -279,7 +282,7 @@
 	mvprintw(DISKROW + 4, DISKCOL, "  sec");
 	for (i = 0, j = 0; i < cur.dk_ndrive && j < DRIVESPACE; i++)
 		if (cur.dk_select[i] && (j + strlen(dr_name[i])) < DRIVESPACE) {
-			l = MAX(5, strlen(dr_name[i]));
+			l = MAXIMUM(5, strlen(dr_name[i]));
 			mvprintw(DISKROW, DISKCOL + 5 + j,
 			    " %*s", l, dr_name[i]);
 			j += 1 + l;
@@ -427,7 +430,7 @@
 	mvprintw(DISKROW, DISKCOL + 5, "                              ");
 	for (i = 0, c = 0; i < cur.dk_ndrive && c < DRIVESPACE; i++)
 		if (cur.dk_select[i] && (c + strlen(dr_name[i])) < DRIVESPACE) {
-			l = MAX(5, strlen(dr_name[i]));
+			l = MAXIMUM(5, strlen(dr_name[i]));
 			mvprintw(DISKROW, DISKCOL + 5 + c,
 			    " %*s", l, dr_name[i]);
 			c += 1 + l;