rll does not seem to be available on legacy s390.
[openssl.git] / apps / app_rand.c
index 2126fd5..b7b6128 100644 (file)
@@ -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)