From d205a2aecb99564cccfbea61c39ebe3b0ddd7fb7 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Thu, 29 May 2014 20:21:23 +0000
Subject: Everything sane has stdio, and FILE *. we don't need ifdefs for this.
 ok to firebomb from tedu@

---
 src/lib/libcrypto/err/err.h     | 4 ----
 src/lib/libcrypto/err/err_prn.c | 2 --
 2 files changed, 6 deletions(-)

(limited to 'src/lib/libcrypto/err')

diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 601f56a624..0396aba726 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -114,10 +114,8 @@
 
 #include <openssl/opensslconf.h>
 
-#ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
 #include <stdlib.h>
-#endif
 
 #include <openssl/ossl_typ.h>
 #ifndef OPENSSL_NO_BIO
@@ -337,9 +335,7 @@ const char *ERR_func_error_string(unsigned long e);
 const char *ERR_reason_error_string(unsigned long e);
 void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
     void *u);
-#ifndef OPENSSL_NO_FP_API
 void ERR_print_errors_fp(FILE *fp);
-#endif
 #ifndef OPENSSL_NO_BIO
 void ERR_print_errors(BIO *bp);
 #endif
diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c
index d6b488fee9..7790287a3f 100644
--- a/src/lib/libcrypto/err/err_prn.c
+++ b/src/lib/libcrypto/err/err_prn.c
@@ -86,7 +86,6 @@ ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), void *u)
 	}
 }
 
-#ifndef OPENSSL_NO_FP_API
 static int
 print_fp(const char *str, size_t len, void *fp)
 {
@@ -103,7 +102,6 @@ ERR_print_errors_fp(FILE *fp)
 {
 	ERR_print_errors_cb(print_fp, fp);
 }
-#endif
 
 static int
 print_bio(const char *str, size_t len, void *bp)
-- 
cgit v1.2.3-55-g6feb