Fix (most) WIN32 warnings and errors.

[openssl.git] / crypto / evp / c_all.c

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index af3dd261629a7184888c54aaa32f6f07a7ca009b..a5da52e62d8b03ef8625fe39eb64df4f59faf97e 100644 (file)
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -59,6 +59,9 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
 
 #if 0
 #undef OpenSSL_add_all_algorithms
@@ -71,9 +74,17 @@ void OpenSSL_add_all_algorithms(void)
 
 void OPENSSL_add_all_algorithms_noconf(void)
        {
+       /*
+        * For the moment OPENSSL_cpuid_setup does something
+        * only on IA-32, but we reserve the option for all
+        * platforms...
+        */
+       OPENSSL_cpuid_setup();
        OpenSSL_add_all_ciphers();
        OpenSSL_add_all_digests();
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#ifndef OPENSSL_NO_ENGINE
+# if defined(__OpenBSD__) || defined(__FreeBSD__)
        ENGINE_setup_bsd_cryptodev();
+# endif
 #endif
        }