diff options
Diffstat (limited to 'usr.bin/fstat')
| -rw-r--r-- | usr.bin/fstat/fstat.c | 8 | ||||
| -rw-r--r-- | usr.bin/fstat/fuser.c | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index ac2c501a658..bbf26c55d7a 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fstat.c,v 1.79 2014/08/20 11:23:42 mikeb Exp $ */ +/* $OpenBSD: fstat.c,v 1.80 2015/01/16 06:40:08 deraadt Exp $ */ /* * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com> @@ -45,7 +45,7 @@ * SUCH DAMAGE. */ -#include <sys/param.h> +#include <sys/types.h> #include <sys/queue.h> #include <sys/mount.h> #include <sys/stat.h> @@ -84,6 +84,8 @@ #include "fstat.h" +#define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) + struct fileargs fileargs = SLIST_HEAD_INITIALIZER(fileargs); int fsflg; /* show files on same filesystem as file(s) argument */ @@ -480,7 +482,7 @@ pipetrans(struct kinfo_file *kf) * same visible addr. (it's the higher address because when the other * end closes, it becomes 0) */ - maxaddr = (void *)(uintptr_t)MAX(kf->f_data, kf->pipe_peer); + maxaddr = (void *)(uintptr_t)MAXIMUM(kf->f_data, kf->pipe_peer); printf("pipe "); hide(maxaddr); diff --git a/usr.bin/fstat/fuser.c b/usr.bin/fstat/fuser.c index 4824e33c936..96212e6ece3 100644 --- a/usr.bin/fstat/fuser.c +++ b/usr.bin/fstat/fuser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuser.c,v 1.5 2014/10/26 06:03:24 guenther Exp $ */ +/* $OpenBSD: fuser.c,v 1.6 2015/01/16 06:40:08 deraadt Exp $ */ /* * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com> @@ -41,7 +41,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> #include <sys/queue.h> #include <sys/stat.h> #include <sys/sysctl.h> |