diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-27 16:06:22 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-27 16:06:22 +0100 |
| commit | a00ae6c46e0d7907a7c9f9e85334e968aa5fd338 (patch) | |
| tree | 79a0e748842c1a3ed15b3b4a1ab08ce29bab5280 /crypto/txt_db | |
| parent | OPENSSL_NO_xxx cleanup: DEC-CBCM removed (diff) | |
| download | openssl-a00ae6c46e0d7907a7c9f9e85334e968aa5fd338.tar.xz openssl-a00ae6c46e0d7907a7c9f9e85334e968aa5fd338.zip | |
OPENSSL_NO_xxx cleanup: many removals
The following compile options (#ifdef's) are removed:
OPENSSL_NO_BIO OPENSSL_NO_BUFFER OPENSSL_NO_CHAIN_VERIFY
OPENSSL_NO_EVP OPENSSL_NO_FIPS_ERR OPENSSL_NO_HASH_COMP
OPENSSL_NO_LHASH OPENSSL_NO_OBJECT OPENSSL_NO_SPEED OPENSSL_NO_STACK
OPENSSL_NO_X509 OPENSSL_NO_X509_VERIFY
This diff is big because of updating the indents on preprocessor lines.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/txt_db')
| -rw-r--r-- | crypto/txt_db/txt_db.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/crypto/txt_db/txt_db.h b/crypto/txt_db/txt_db.h index 98e23a2003..54b71fc03e 100644 --- a/crypto/txt_db/txt_db.h +++ b/crypto/txt_db/txt_db.h @@ -60,9 +60,7 @@ # define HEADER_TXT_DB_H # include <openssl/opensslconf.h> -# ifndef OPENSSL_NO_BIO -# include <openssl/bio.h> -# endif +# include <openssl/bio.h> # include <openssl/stack.h> # include <openssl/lhash.h> @@ -91,13 +89,8 @@ typedef struct txt_db_st { OPENSSL_STRING *arg_row; } TXT_DB; -# ifndef OPENSSL_NO_BIO TXT_DB *TXT_DB_read(BIO *in, int num); long TXT_DB_write(BIO *out, TXT_DB *db); -# else -TXT_DB *TXT_DB_read(char *in, int num); -long TXT_DB_write(char *out, TXT_DB *db); -# endif int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *), LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp); void TXT_DB_free(TXT_DB *db); |