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

1 files changed, 4 insertions, 5 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index 25d6ebc53..fd5f2b35d 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.213 2016/05/02 08:49:03 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.214 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
@@ -36,7 +36,6 @@
 
 #include "includes.h"
 
-#include <sys/param.h>  /* MIN MAX */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/resource.h>
@@ -539,7 +538,7 @@ reaper(void)
                                 tab->nentries--;
                         } else
                                 deadline = (deadline == 0) ? id->death :
-                                    MIN(deadline, id->death);
+                                    MINIMUM(deadline, id->death);
                 }
         }
         if (deadline == 0 || deadline <= now)
@@ -991,7 +990,7 @@ prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, u_int *nallocp,
                 switch (sockets[i].type) {
                 case AUTH_SOCKET:
                 case AUTH_CONNECTION:
-                        n = MAX(n, sockets[i].fd);
+                        n = MAXIMUM(n, sockets[i].fd);
                         break;
                 case AUTH_UNUSED:
                         break;
@@ -1030,7 +1029,7 @@ prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, u_int *nallocp,
         deadline = reaper();
         if (parent_alive_interval != 0)
                 deadline = (deadline == 0) ? parent_alive_interval :
-                    MIN(deadline, parent_alive_interval);
+                    MINIMUM(deadline, parent_alive_interval);
         if (deadline == 0) {
                 *tvpp = NULL;
         } else {