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/rsa.h | |
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 'include/openssl/rsa.h')
-rw-r--r-- | include/openssl/rsa.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h index adad0f144c..e7ae827715 100644 --- a/include/openssl/rsa.h +++ b/include/openssl/rsa.h @@ -59,26 +59,18 @@ # define HEADER_RSA_H # include <openssl/opensslconf.h> -# include <openssl/asn1.h> +# ifndef OPENSSL_NO_RSA +# include <openssl/asn1.h> # include <openssl/bio.h> # include <openssl/crypto.h> # include <openssl/ossl_typ.h> # if OPENSSL_API_COMPAT < 0x10100000L # include <openssl/bn.h> # endif - -# ifdef OPENSSL_NO_RSA -# error RSA is disabled. -# endif - -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif - -/* Declared already in ossl_typ.h */ -/* typedef struct rsa_st RSA; */ -/* typedef struct rsa_meth_st RSA_METHOD; */ +# endif struct rsa_meth_st { const char *name; @@ -638,7 +630,9 @@ void ERR_load_RSA_strings(void); # define RSA_R_VALUE_MISSING 147 # define RSA_R_WRONG_SIGNATURE_LENGTH 119 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif + #endif |