summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/err/err_all.c
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2015-05-06 09:49:30 -0400
committerMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2015-05-06 09:49:30 -0400
commit2283f5e85dbc78dd10810cb6ebfa39e61ab6759e (patch)
tree88017c6acfa326ebaab2d7a4935534f65a36db9b /Cryptlib/OpenSSL/crypto/err/err_all.c
parent3967dc652453e47ecd5f21a55bb687be15c59e9c (diff)
downloadefi-boot-shim-2283f5e85dbc78dd10810cb6ebfa39e61ab6759e.tar.gz
efi-boot-shim-2283f5e85dbc78dd10810cb6ebfa39e61ab6759e.zip
Unapplying patches to prevent spurious conflicts.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/err/err_all.c')
-rwxr-xr-xCryptlib/OpenSSL/crypto/err/err_all.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/err/err_all.c b/Cryptlib/OpenSSL/crypto/err/err_all.c
index 0429389f..39796f7c 100755
--- a/Cryptlib/OpenSSL/crypto/err/err_all.c
+++ b/Cryptlib/OpenSSL/crypto/err/err_all.c
@@ -104,9 +104,7 @@
#ifndef OPENSSL_NO_JPAKE
#include <openssl/jpake.h>
#endif
-#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h>
-#endif
void ERR_load_crypto_strings(void)
{