From: Nikos Mavrogiannopoulos Date: Thu, 27 Oct 2011 07:16:41 +0000 (+0200) Subject: do not use NULL for device_fd in windows. X-Git-Tag: gnutls_3_0_5~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1790ba91f21c233d5cfb920992bb3fc56280c7b5;p=thirdparty%2Fgnutls.git do not use NULL for device_fd in windows. --- diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c index 13a1184b50..6e7c69aca7 100644 --- a/lib/nettle/rnd.c +++ b/lib/nettle/rnd.c @@ -61,7 +61,7 @@ static void *rnd_mutex; #define DEVICE_READ_SIZE 16 #define DEVICE_READ_SIZE_MAX 32 -static HCRYPTPROV device_fd = NULL; +static HCRYPTPROV device_fd = 0; static int do_trivia_source (int init) @@ -112,7 +112,7 @@ do_device_source (int init) read_size = DEVICE_READ_SIZE_MAX; /* initially read more data */ } - if ((device_fd != NULL) + if ((device_fd != 0) && (init || ((now - device_last_read) > DEVICE_READ_INTERVAL))) {