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 /include/openssl/x509.h | |
| 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 'include/openssl/x509.h')
| -rw-r--r-- | include/openssl/x509.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 5c138ca..d21460a 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -72,21 +72,12 @@ # include <openssl/stack.h> # include <openssl/asn1.h> # include <openssl/safestack.h> - -# ifndef OPENSSL_NO_EC -# include <openssl/ec.h> -# endif +# include <openssl/ec.h> # if OPENSSL_API_COMPAT < 0x10100000L -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif -# ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -# endif -# ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -# endif +# include <openssl/rsa.h> +# include <openssl/dsa.h> +# include <openssl/dh.h> # endif # include <openssl/sha.h> |