Simplify preprocessor statements.

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index e8e12e21c701202597552bd8354222ae1a7180fc..eed64e62a2313256949d290bf85bcac5f0f2a1c1 100644 (file)
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -688,17 +688,18 @@ static void readscreen(void)
 
 #include <time.h>
 
 
 #include <time.h>
 

+#ifdef NO_FP_API
+#  undef DEVRANDOM
+#endif
+

 int RAND_poll(void)
 {
        unsigned long l;
        pid_t curr_pid = getpid();
 int RAND_poll(void)
 {
        unsigned long l;
        pid_t curr_pid = getpid();

-#ifndef NO_FP_API

 #ifdef DEVRANDOM
        FILE *fh;
 #endif
 #ifdef DEVRANDOM
        FILE *fh;
 #endif

-#endif

 
 

-#ifndef NO_FP_API

 #ifdef DEVRANDOM
        /* Use a random entropy pool device. Linux, FreeBSD and OpenBSD
         * have this. Use /dev/urandom if you can as /dev/random may block
 #ifdef DEVRANDOM
        /* Use a random entropy pool device. Linux, FreeBSD and OpenBSD
         * have this. Use /dev/urandom if you can as /dev/random may block


@@ -715,7 +716,6 @@ int RAND_poll(void)
                RAND_add(tmpbuf,sizeof tmpbuf,n);
                memset(tmpbuf,0,n);
                }
                RAND_add(tmpbuf,sizeof tmpbuf,n);
                memset(tmpbuf,0,n);
                }

-#endif

 #endif
 
        /* put in some default random data, we need more than just this */
 #endif
 
        /* put in some default random data, we need more than just this */


@@ -727,10 +727,8 @@ int RAND_poll(void)
        l=time(NULL);
        RAND_add(&l,sizeof(l),0);
 
        l=time(NULL);
        RAND_add(&l,sizeof(l),0);
 

-#ifndef NO_FP_API

 #ifdef DEVRANDOM
        return 1;
 #ifdef DEVRANDOM
        return 1;

-#endif

 #endif
        return 0;
 }
 #endif
        return 0;
 }