From 2283f5e85dbc78dd10810cb6ebfa39e61ab6759e Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Wed, 6 May 2015 09:49:30 -0400
Subject: Unapplying patches to prevent spurious conflicts.

---
 Cryptlib/OpenSSL/crypto/conf/conf_sap.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'Cryptlib/OpenSSL/crypto/conf/conf_sap.c')

diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_sap.c b/Cryptlib/OpenSSL/crypto/conf/conf_sap.c
index 35f4a272..760dc263 100644
--- a/Cryptlib/OpenSSL/crypto/conf/conf_sap.c
+++ b/Cryptlib/OpenSSL/crypto/conf/conf_sap.c
@@ -93,14 +93,12 @@ void OPENSSL_config(const char *config_name)
 		{
 		BIO *bio_err;
 		ERR_load_crypto_strings();
-#ifndef OPENSSL_NO_STDIO
 		if ((bio_err=BIO_new_fp(stderr, BIO_NOCLOSE)) != NULL)
 			{
 			BIO_printf(bio_err,"Auto configuration failed\n");
 			ERR_print_errors(bio_err);
 			BIO_free(bio_err);
 			}
-#endif
 		exit(1);
 		}
 
-- 
cgit v1.2.3