From 50c17820b957a3701405f7c9e3c78d197e41b584 Mon Sep 17 00:00:00 2001 From: djm Date: Mon, 6 Apr 2009 06:33:15 +0000 Subject: resolve conflicts --- lib/libssl/src/crypto/rand/rand_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libssl/src/crypto/rand/rand_unix.c') diff --git a/lib/libssl/src/crypto/rand/rand_unix.c b/lib/libssl/src/crypto/rand/rand_unix.c index 964d25833cd..58c61730946 100644 --- a/lib/libssl/src/crypto/rand/rand_unix.c +++ b/lib/libssl/src/crypto/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; -- cgit v1.2.3-59-g8ed1b