diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2016-09-12 01:22:38 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 13:46:29 +1000 |
| commit | 9136ec134c97a8aff2917760c03134f52945ff3c (patch) | |
| tree | bfcab357e6e0f510d9b63bac43b18097e89fa58a /sftp-server.c | |
| parent | f219fc8f03caca7ac82a38ed74bbd6432a1195e7 (diff) | |
| download | openssh-git-9136ec134c97a8aff2917760c03134f52945ff3c.tar.gz | |
upstream commit
Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then
use those definitions rather than pulling <sys/param.h> and unknown namespace
pollution. ok djm markus dtucker
Upstream-ID: 712cafa816c9f012a61628b66b9fbd5687223fb8
Diffstat (limited to 'sftp-server.c')
| -rw-r--r-- | sftp-server.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sftp-server.c b/sftp-server.c index 646286a3..3619cdfc 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.109 2016/02/15 09:47:49 dtucker Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.110 2016/09/12 01:22:38 deraadt Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -17,7 +17,6 @@ #include "includes.h" -#include <sys/param.h> /* MIN */ #include <sys/types.h> #include <sys/stat.h> #ifdef HAVE_SYS_TIME_H @@ -505,7 +504,7 @@ status_to_message(u_int32_t status) "Operation unsupported", /* SSH_FX_OP_UNSUPPORTED */ "Unknown error" /* Others */ }; - return (status_messages[MIN(status,SSH2_FX_MAX)]); + return (status_messages[MINIMUM(status,SSH2_FX_MAX)]); } static void |