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/rsa | |
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/rsa')
-rw-r--r-- | crypto/rsa/rsa_ameth.c | 4 | ||||
-rw-r--r-- | crypto/rsa/rsa_lib.c | 4 | ||||
-rw-r--r-- | crypto/rsa/rsa_pmeth.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c index 15f2194bf1..ad51a440e5 100644 --- a/crypto/rsa/rsa_ameth.c +++ b/crypto/rsa/rsa_ameth.c @@ -62,9 +62,7 @@ #include <openssl/x509.h> #include <openssl/rsa.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 9cc88142b6..bd881ed528 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -62,9 +62,7 @@ #include "internal/bn_int.h" #include <openssl/rsa.h> #include <openssl/rand.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> static const RSA_METHOD *default_RSA_meth = NULL; diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index 93c8756068..22089a3267 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -64,9 +64,7 @@ #include <openssl/bn.h> #include <openssl/evp.h> #include <openssl/x509v3.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> #include "internal/evp_int.h" #include "rsa_locl.h" |