diff options
| author | djm <> | 2009-04-06 06:33:20 +0000 |
|---|---|---|
| committer | djm <> | 2009-04-06 06:33:20 +0000 |
| commit | ee26f086217016f09154412b171ad62a33a346f6 (patch) | |
| tree | 647f179fa8dcccf50c436cc0165a1d67476a936e /src/lib/libcrypto/rand/rand_unix.c | |
| parent | f929570d17be2469dc7104fcdf26fdaddf3dbb65 (diff) | |
| download | openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.gz openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.bz2 openbsd-ee26f086217016f09154412b171ad62a33a346f6.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/rand/rand_unix.c')
| -rw-r--r-- | src/lib/libcrypto/rand/rand_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/rand/rand_unix.c b/src/lib/libcrypto/rand/rand_unix.c index 964d25833c..58c6173094 100644 --- a/src/lib/libcrypto/rand/rand_unix.c +++ b/src/lib/libcrypto/rand/rand_unix.c | |||
| @@ -226,7 +226,7 @@ int RAND_poll(void) | |||
| 226 | t.tv_sec = 0; | 226 | t.tv_sec = 0; |
| 227 | t.tv_usec = usec; | 227 | t.tv_usec = usec; |
| 228 | 228 | ||
| 229 | if (FD_SETSIZE > 0 && fd >= FD_SETSIZE) | 229 | if (FD_SETSIZE > 0 && (unsigned)fd >= FD_SETSIZE) |
| 230 | { | 230 | { |
| 231 | /* can't use select, so just try to read once anyway */ | 231 | /* can't use select, so just try to read once anyway */ |
| 232 | try_read = 1; | 232 | try_read = 1; |