diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-03-18 14:30:20 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-20 19:48:36 -0400 |
| commit | 3c27208fab1dc29f47f088490404df5abfcdfb05 (patch) | |
| tree | 3654ea8c099e19203a48ce2688aeee02f46fd12b /crypto/x509 | |
| parent | 8230f6c764f854190358cf40f0e7e7ca5647d8cd (diff) | |
| download | openssl-3c27208fab1dc29f47f088490404df5abfcdfb05.tar.gz | |
Remove #error from include files.
Don't have #error statements in header files, but instead wrap
the contents of that file in #ifndef OPENSSL_NO_xxx
This means it is now always safe to include the header file.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/t_req.c | 8 | ||||
| -rw-r--r-- | crypto/x509/x_all.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/crypto/x509/t_req.c b/crypto/x509/t_req.c index 2c519f9785..afe59c4e9c 100644 --- a/crypto/x509/t_req.c +++ b/crypto/x509/t_req.c @@ -62,12 +62,8 @@ #include <openssl/objects.h> #include <openssl/x509.h> #include <openssl/x509v3.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> #ifndef OPENSSL_NO_STDIO int X509_REQ_print_fp(FILE *fp, X509_REQ *x) diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c index f62a7c86b2..c370ba94bb 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -64,12 +64,8 @@ #include <openssl/x509.h> #include "internal/x509_int.h" #include <openssl/ocsp.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> int X509_verify(X509 *a, EVP_PKEY *r) { |