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/err | |
| parent | 8230f6c764f854190358cf40f0e7e7ca5647d8cd (diff) | |
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/err')
| -rw-r--r-- | crypto/err/err_all.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 8939c085ea..a79a84e544 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -59,23 +59,13 @@ #include <internal/err.h> #include <openssl/asn1.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_EC -# include <openssl/ec.h> -#endif +#include <openssl/ec.h> #include <openssl/buffer.h> #include <openssl/bio.h> -#ifndef OPENSSL_NO_COMP -# include <openssl/comp.h> -#endif -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/comp.h> +#include <openssl/rsa.h> +#include <openssl/dh.h> +#include <openssl/dsa.h> #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/pem2.h> @@ -85,9 +75,7 @@ #include <openssl/pkcs12.h> #include <openssl/rand.h> #include <openssl/dso.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/ui.h> #include <openssl/ocsp.h> #include <openssl/err.h> @@ -95,12 +83,8 @@ # include <openssl/fips.h> #endif #include <openssl/ts.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif -#ifndef OPENSSL_NO_CT -# include <openssl/ct.h> -#endif +#include <openssl/cms.h> +#include <openssl/ct.h> #include <openssl/async.h> #include <openssl/kdf.h> |