Fix merge error

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

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index a3ed00d4c1691fec971ef1cab137b43acb9e5a8d..e56f5adcb72d2546a738314e12ae19fd1c1f9039 100644 (file)
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -57,21 +57,12 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 #endif
 
-#if 0
-# undef OpenSSL_add_all_algorithms
-
-void OpenSSL_add_all_algorithms(void)
-{
-    OPENSSL_add_all_algorithms_noconf();
-}
-#endif
-
 void OPENSSL_add_all_algorithms_noconf(void)
 {
     /*