diff options
| author | millert@openbsd.org <millert@openbsd.org> | 2015-02-06 23:21:59 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-02-09 09:28:17 +1100 |
| commit | fd36834871d06a03e1ff8d69e41992efa1bbf85f (patch) | |
| tree | 95390638f8f92dfd017176d558acec1e91a9e3b0 /channels.c | |
| parent | 1910a286d7771eab84c0b047f31c0a17505236fa (diff) | |
upstream commit
SIZE_MAX is standard, we should be using it in preference to
the obsolete SIZE_T_MAX. OK miod@ beck@
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.340 2015/01/20 23:14:00 deraadt Exp $ */ +/* $OpenBSD: channels.c,v 1.341 2015/02/06 23:21:59 millert Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -57,12 +57,12 @@ #include <errno.h> #include <fcntl.h> #include <netdb.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <termios.h> #include <unistd.h> -#include <limits.h> #include <stdarg.h> #include "openbsd-compat/sys-queue.h" @@ -2184,7 +2184,7 @@ channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp, nfdset = howmany(n+1, NFDBITS); /* Explicitly test here, because xrealloc isn't always called */ - if (nfdset && SIZE_T_MAX / nfdset < sizeof(fd_mask)) + if (nfdset && SIZE_MAX / nfdset < sizeof(fd_mask)) fatal("channel_prepare_select: max_fd (%d) is too large", n); sz = nfdset * sizeof(fd_mask); |