diff options
| author | beck <> | 2014-05-29 20:21:23 +0000 |
|---|---|---|
| committer | beck <> | 2014-05-29 20:21:23 +0000 |
| commit | f60b3b3365842d8869513a7e36981671cd726939 (patch) | |
| tree | 0085ebdac711a18932d8d8d531d36f82fce2c8bc /src/lib/libcrypto/bio/bio.h | |
| parent | dc6328fe23d92fbfdbeb94ca011ea0d7a563935f (diff) | |
| download | openbsd-f60b3b3365842d8869513a7e36981671cd726939.tar.gz openbsd-f60b3b3365842d8869513a7e36981671cd726939.tar.bz2 openbsd-f60b3b3365842d8869513a7e36981671cd726939.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/bio/bio.h')
| -rw-r--r-- | src/lib/libcrypto/bio/bio.h | 6 |
1 files changed, 0 insertions, 6 deletions
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 @@ | |||
| 61 | 61 | ||
| 62 | #include <openssl/opensslconf.h> | 62 | #include <openssl/opensslconf.h> |
| 63 | 63 | ||
| 64 | #ifndef OPENSSL_NO_FP_API | ||
| 65 | # include <stdio.h> | 64 | # include <stdio.h> |
| 66 | #endif | ||
| 67 | #include <stdarg.h> | 65 | #include <stdarg.h> |
| 68 | 66 | ||
| 69 | #include <openssl/crypto.h> | 67 | #include <openssl/crypto.h> |
| @@ -619,12 +617,10 @@ int | |||
| 619 | BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix, | 617 | BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix, |
| 620 | asn1_ps_func **psuffix_free); | 618 | asn1_ps_func **psuffix_free); |
| 621 | 619 | ||
| 622 | # ifndef OPENSSL_NO_FP_API | ||
| 623 | BIO_METHOD *BIO_s_file(void ); | 620 | BIO_METHOD *BIO_s_file(void ); |
| 624 | BIO *BIO_new_file(const char *filename, const char *mode); | 621 | BIO *BIO_new_file(const char *filename, const char *mode); |
| 625 | BIO *BIO_new_fp(FILE *stream, int close_flag); | 622 | BIO *BIO_new_fp(FILE *stream, int close_flag); |
| 626 | # define BIO_s_file_internal BIO_s_file | 623 | # define BIO_s_file_internal BIO_s_file |
| 627 | # endif | ||
| 628 | BIO * BIO_new(BIO_METHOD *type); | 624 | BIO * BIO_new(BIO_METHOD *type); |
| 629 | int BIO_set(BIO *a, BIO_METHOD *type); | 625 | int BIO_set(BIO *a, BIO_METHOD *type); |
| 630 | int BIO_free(BIO *a); | 626 | int BIO_free(BIO *a); |
| @@ -694,10 +690,8 @@ BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), | |||
| 694 | void *u, const char *s, int len, int indent); | 690 | void *u, const char *s, int len, int indent); |
| 695 | int BIO_dump(BIO *b, const char *bytes, int len); | 691 | int BIO_dump(BIO *b, const char *bytes, int len); |
| 696 | int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent); | 692 | int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent); |
| 697 | #ifndef OPENSSL_NO_FP_API | ||
| 698 | int BIO_dump_fp(FILE *fp, const char *s, int len); | 693 | int BIO_dump_fp(FILE *fp, const char *s, int len); |
| 699 | int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent); | 694 | int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent); |
| 700 | #endif | ||
| 701 | struct hostent *BIO_gethostbyname(const char *name); | 695 | struct hostent *BIO_gethostbyname(const char *name); |
| 702 | /* We might want a thread-safe interface too: | 696 | /* We might want a thread-safe interface too: |
| 703 | * struct hostent *BIO_gethostbyname_r(const char *name, | 697 | * struct hostent *BIO_gethostbyname_r(const char *name, |
