summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/err
diff options
context:
space:
mode:
authorbeck <>2014-05-29 20:21:23 +0000
committerbeck <>2014-05-29 20:21:23 +0000
commitd205a2aecb99564cccfbea61c39ebe3b0ddd7fb7 (patch)
tree0085ebdac711a18932d8d8d531d36f82fce2c8bc /src/lib/libcrypto/err
parent6f22007e67d4c2d77b9caea83bc05974d11dbb0d (diff)
downloadopenbsd-d205a2aecb99564cccfbea61c39ebe3b0ddd7fb7.tar.gz
openbsd-d205a2aecb99564cccfbea61c39ebe3b0ddd7fb7.tar.bz2
openbsd-d205a2aecb99564cccfbea61c39ebe3b0ddd7fb7.zip
Everything sane has stdio, and FILE *. we don't need ifdefs for this.
ok to firebomb from tedu@
Diffstat (limited to 'src/lib/libcrypto/err')
-rw-r--r--src/lib/libcrypto/err/err.h4
-rw-r--r--src/lib/libcrypto/err/err_prn.c2
2 files changed, 0 insertions, 6 deletions
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 @@
114 114
115#include <openssl/opensslconf.h> 115#include <openssl/opensslconf.h>
116 116
117#ifndef OPENSSL_NO_FP_API
118#include <stdio.h> 117#include <stdio.h>
119#include <stdlib.h> 118#include <stdlib.h>
120#endif
121 119
122#include <openssl/ossl_typ.h> 120#include <openssl/ossl_typ.h>
123#ifndef OPENSSL_NO_BIO 121#ifndef OPENSSL_NO_BIO
@@ -337,9 +335,7 @@ const char *ERR_func_error_string(unsigned long e);
337const char *ERR_reason_error_string(unsigned long e); 335const char *ERR_reason_error_string(unsigned long e);
338void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), 336void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
339 void *u); 337 void *u);
340#ifndef OPENSSL_NO_FP_API
341void ERR_print_errors_fp(FILE *fp); 338void ERR_print_errors_fp(FILE *fp);
342#endif
343#ifndef OPENSSL_NO_BIO 339#ifndef OPENSSL_NO_BIO
344void ERR_print_errors(BIO *bp); 340void ERR_print_errors(BIO *bp);
345#endif 341#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)
86 } 86 }
87} 87}
88 88
89#ifndef OPENSSL_NO_FP_API
90static int 89static int
91print_fp(const char *str, size_t len, void *fp) 90print_fp(const char *str, size_t len, void *fp)
92{ 91{
@@ -103,7 +102,6 @@ ERR_print_errors_fp(FILE *fp)
103{ 102{
104 ERR_print_errors_cb(print_fp, fp); 103 ERR_print_errors_cb(print_fp, fp);
105} 104}
106#endif
107 105
108static int 106static int
109print_bio(const char *str, size_t len, void *bp) 107print_bio(const char *str, size_t len, void *bp)