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/ec | |
| 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/ec')
| -rw-r--r-- | crypto/ec/ec_ameth.c | 4 | ||||
| -rw-r--r-- | crypto/ec/ec_key.c | 4 | ||||
| -rw-r--r-- | crypto/ec/ec_kmeth.c | 4 | ||||
| -rw-r--r-- | crypto/ec/ecdsa_sign.c | 4 | ||||
| -rw-r--r-- | crypto/ec/ecdsa_vrf.c | 4 |
5 files changed, 5 insertions, 15 deletions
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 310bfad050..ca354c05cd 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -61,9 +61,7 @@ #include <openssl/x509.h> #include <openssl/ec.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> #include <openssl/asn1t.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c index 0d7370eef9..d241154630 100644 --- a/crypto/ec/ec_key.c +++ b/crypto/ec/ec_key.c @@ -64,9 +64,7 @@ #include <string.h> #include "ec_lcl.h" #include <openssl/err.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> EC_KEY *EC_KEY_new(void) { diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c index dc097ce0dc..003421eabe 100644 --- a/crypto/ec/ec_kmeth.c +++ b/crypto/ec/ec_kmeth.c @@ -53,9 +53,7 @@ #include <string.h> #include <openssl/ec.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/err.h> #include "ec_lcl.h" diff --git a/crypto/ec/ecdsa_sign.c b/crypto/ec/ecdsa_sign.c index df90175980..738c276ae9 100644 --- a/crypto/ec/ecdsa_sign.c +++ b/crypto/ec/ecdsa_sign.c @@ -54,9 +54,7 @@ #include <openssl/ec.h> #include "ec_lcl.h" -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/rand.h> #include <openssl/err.h> diff --git a/crypto/ec/ecdsa_vrf.c b/crypto/ec/ecdsa_vrf.c index 0441bc0c59..f519b59807 100644 --- a/crypto/ec/ecdsa_vrf.c +++ b/crypto/ec/ecdsa_vrf.c @@ -58,9 +58,7 @@ #include <openssl/ec.h> #include "ec_lcl.h" #include <string.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/err.h> /*- |