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 /ssl/ssl_lib.c | |
| parent | 8230f6c764f854190358cf40f0e7e7ca5647d8cd (diff) | |
| download | openssl-3c27208fab1dc29f47f088490404df5abfcdfb05.zip openssl-3c27208fab1dc29f47f088490404df5abfcdfb05.tar.gz openssl-3c27208fab1dc29f47f088490404df5abfcdfb05.tar.bz2 | |
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 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 87e3dfa..3385bc1 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -152,16 +152,10 @@ #include <openssl/x509v3.h> #include <openssl/rand.h> #include <openssl/ocsp.h> -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/dh.h> +#include <openssl/engine.h> #include <openssl/async.h> -#ifndef OPENSSL_NO_CT -# include <openssl/ct.h> -#endif +#include <openssl/ct.h> const char SSL_version_str[] = OPENSSL_VERSION_TEXT; |