X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fapp_rand.c;h=b7b6128c1eb901a383f5e0bfb07c32ba52d130ed;hp=2126fd5aa1981d9795454eeb8cb407f511ec7bf5;hb=df24f29ae6d14a564c76fed10ac32701128c3f36;hpb=4fb40db932c9d183de7a4ee67163d6e70aac56c8

diff --git a/apps/app_rand.c b/apps/app_rand.c
index 2126fd5aa1..b7b6128c1e 100644
--- a/apps/app_rand.c
+++ b/apps/app_rand.c
@@ -124,7 +124,7 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
 	int consider_randfile = (file == NULL);
 	char buffer[200];
 	
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
 	BIO_printf(bio_e,"Loading 'screen' into random state -");
 	BIO_flush(bio_e);
 	RAND_screen();
@@ -180,8 +180,10 @@ long app_RAND_load_files(char *name)
 		if (*n == '\0') break;
 
 		egd=RAND_egd(n);
-		if (egd > 0) tot+=egd;
-		tot+=RAND_load_file(n,-1);
+		if (egd > 0)
+			tot+=egd;
+		else
+			tot+=RAND_load_file(n,-1);
 		if (last) break;
 		}
 	if (tot > 512)