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 /moduli.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 'moduli.c')
| -rw-r--r-- | moduli.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: moduli.c,v 1.30 2015/01/20 23:14:00 deraadt Exp $ */ +/* $OpenBSD: moduli.c,v 1.31 2016/09/12 01:22:38 deraadt Exp $ */ /* * Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> @@ -41,7 +41,6 @@ #ifdef WITH_OPENSSL -#include <sys/param.h> /* MAX */ #include <sys/types.h> #include <openssl/bn.h> @@ -609,7 +608,7 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted, if (checkpoint_file != NULL) last_processed = read_checkpoint(checkpoint_file); - last_processed = start_lineno = MAX(last_processed, start_lineno); + last_processed = start_lineno = MAXIMUM(last_processed, start_lineno); if (end_lineno == ULONG_MAX) debug("process from line %lu from pipe", last_processed); else |