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/dh | |
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/dh')
-rw-r--r-- | crypto/dh/dh_ameth.c | 4 | ||||
-rw-r--r-- | crypto/dh/dh_lib.c | 4 | ||||
-rw-r--r-- | crypto/dh/dh_pmeth.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index d644c86531..fc03d8fb0d 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -64,9 +64,7 @@ #include <openssl/bn.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> /* * i2d/d2i like DH parameter functions which use the appropriate routine for diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c index d7aed6a282..1a0c054eeb 100644 --- a/crypto/dh/dh_lib.c +++ b/crypto/dh/dh_lib.c @@ -59,9 +59,7 @@ #include "internal/cryptlib.h" #include <openssl/bn.h> #include <openssl/dh.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> static const DH_METHOD *default_DH_method = NULL; diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c index a760ff5390..93bada0058 100644 --- a/crypto/dh/dh_pmeth.c +++ b/crypto/dh/dh_pmeth.c @@ -63,9 +63,7 @@ #include <openssl/evp.h> #include <openssl/dh.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/dsa.h> #include <openssl/objects.h> #include "internal/evp_int.h" |