diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2016-09-12 03:22:38 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 05:46:29 +0200 |
| commit | 9136ec134c97a8aff2917760c03134f52945ff3c (patch) | |
| tree | bfcab357e6e0f510d9b63bac43b18097e89fa58a /serverloop.c | |
| parent | upstream commit (diff) | |
| download | openssh-9136ec134c97a8aff2917760c03134f52945ff3c.tar.xz openssh-9136ec134c97a8aff2917760c03134f52945ff3c.zip | |
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 'serverloop.c')
| -rw-r--r-- | serverloop.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/serverloop.c b/serverloop.c index 1e211701e..87e619fe4 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.185 2016/08/13 17:47:41 markus Exp $ */ +/* $OpenBSD: serverloop.c,v 1.186 2016/09/12 01:22:38 deraadt Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -37,7 +37,6 @@ #include "includes.h" -#include <sys/param.h> /* MIN MAX */ #include <sys/types.h> #include <sys/wait.h> #include <sys/socket.h> @@ -212,7 +211,7 @@ wait_until_can_do_something(int connection_in, int connection_out, /* XXX need proper deadline system for rekey/client alive */ if (minwait_secs != 0) - max_time_ms = MIN(max_time_ms, (u_int)minwait_secs * 1000); + max_time_ms = MINIMUM(max_time_ms, (u_int)minwait_secs * 1000); /* * if using client_alive, set the max timeout accordingly, @@ -372,8 +371,8 @@ server_loop2(Authctxt *authctxt) notify_setup(); - max_fd = MAX(connection_in, connection_out); - max_fd = MAX(max_fd, notify_pipe[0]); + max_fd = MAXIMUM(connection_in, connection_out); + max_fd = MAXIMUM(max_fd, notify_pipe[0]); server_init_dispatch(); |