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/bio/b_dump.c | 2 -- src/lib/libcrypto/bio/bio.h | 6 ------ 2 files changed, 8 deletions(-) (limited to 'src/lib/libcrypto/bio') diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c index 65238299f2..d4750f66be 100644 --- a/src/lib/libcrypto/bio/b_dump.c +++ b/src/lib/libcrypto/bio/b_dump.c @@ -147,7 +147,6 @@ BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), return (ret); } -#ifndef OPENSSL_NO_FP_API static int write_fp(const void *data, size_t len, void *fp) { @@ -165,7 +164,6 @@ BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent) { return BIO_dump_indent_cb(write_fp, fp, s, len, indent); } -#endif static int write_bio(const void *data, size_t len, void *bp) diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h index 67574d9fa4..6809b70e9d 100644 --- a/src/lib/libcrypto/bio/bio.h +++ b/src/lib/libcrypto/bio/bio.h @@ -61,9 +61,7 @@ #include -#ifndef OPENSSL_NO_FP_API # include -#endif #include #include @@ -619,12 +617,10 @@ int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix, asn1_ps_func **psuffix_free); -# ifndef OPENSSL_NO_FP_API BIO_METHOD *BIO_s_file(void ); BIO *BIO_new_file(const char *filename, const char *mode); BIO *BIO_new_fp(FILE *stream, int close_flag); # define BIO_s_file_internal BIO_s_file -# endif BIO * BIO_new(BIO_METHOD *type); int BIO_set(BIO *a, BIO_METHOD *type); int BIO_free(BIO *a); @@ -694,10 +690,8 @@ BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), void *u, const char *s, int len, int indent); int BIO_dump(BIO *b, const char *bytes, int len); int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent); -#ifndef OPENSSL_NO_FP_API int BIO_dump_fp(FILE *fp, const char *s, int len); int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent); -#endif struct hostent *BIO_gethostbyname(const char *name); /* We might want a thread-safe interface too: * struct hostent *BIO_gethostbyname_r(const char *name, -- cgit v1.2.3-55-g6feb