diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-14 15:57:28 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-14 15:57:28 -0500 |
| commit | 4b618848f9beb8271f24883694e097caa70013c0 (patch) | |
| tree | 83a17961f721935b211a19bddf8ea02ab5760fb4 /crypto/err | |
| parent | b3d7294976c58e0e05d0ee44a0e7c9c3b8515e05 (diff) | |
Cleanup OPENSSL_NO_xxx, part 1master-pre-reformat
OPENSSL_NO_RIPEMD160, OPENSSL_NO_RIPEMD merged into OPENSSL_NO_RMD160
OPENSSL_NO_FP_API merged into OPENSSL_NO_STDIO
Two typo's on #endif comments fixed:
OPENSSL_NO_ECB fixed to OPENSSL_NO_OCB
OPENSSL_NO_HW_SureWare fixed to OPENSSL_NO_HW_SUREWARE
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err.h | 4 | ||||
| -rw-r--r-- | crypto/err/err_prn.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/err/err.h b/crypto/err/err.h index 2a00e2805f..7fb73020ec 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -114,7 +114,7 @@ #include <openssl/e_os2.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO #include <stdio.h> #include <stdlib.h> #endif @@ -339,7 +339,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 +#ifndef OPENSSL_NO_STDIO void ERR_print_errors_fp(FILE *fp); #endif #ifndef OPENSSL_NO_BIO diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c index a0168ac8ed..3ed2bbef7c 100644 --- a/crypto/err/err_prn.c +++ b/crypto/err/err_prn.c @@ -86,7 +86,7 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), } } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO static int print_fp(const char *str, size_t len, void *fp) { BIO bio; |