diff options
| author |   djm <djm@openbsd.org> | 2009-04-06 06:33:15 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2009-04-06 06:33:15 +0000 |
| commit | 50c17820b957a3701405f7c9e3c78d197e41b584 (patch) | |
| tree | 6d48b4de4458fad1c083c58332f58788b1b098d9 /lib/libcrypto/rand/rand_unix.c | |
| parent | import of OpenSSL 0.9.8k (diff) | |
| download | wireguard-openbsd-50c17820b957a3701405f7c9e3c78d197e41b584.tar.xz wireguard-openbsd-50c17820b957a3701405f7c9e3c78d197e41b584.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/rand/rand_unix.c')
| -rw-r--r-- | lib/libcrypto/rand/rand_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/rand/rand_unix.c b/lib/libcrypto/rand/rand_unix.c index 964d25833cd..58c61730946 100644 --- a/lib/libcrypto/rand/rand_unix.c +++ b/lib/libcrypto/rand/rand_unix.c @@ -226,7 +226,7 @@ int RAND_poll(void) t.tv_sec = 0; t.tv_usec = usec; - if (FD_SETSIZE > 0 && fd >= FD_SETSIZE) + if (FD_SETSIZE > 0 && (unsigned)fd >= FD_SETSIZE) { /* can't use select, so just try to read once anyway */ try_read = 1; |