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/ts.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/ts.h')
| -rw-r--r-- | include/openssl/ts.h | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/include/openssl/ts.h b/include/openssl/ts.h index ca3969f8c5..2e1514ef5e 100644 --- a/include/openssl/ts.h +++ b/include/openssl/ts.h @@ -60,6 +60,7 @@ # define HEADER_TS_H # include <openssl/opensslconf.h> + # ifndef OPENSSL_NO_TS # include <openssl/symhacks.h> # include <openssl/buffer.h> @@ -68,22 +69,12 @@ # include <openssl/stack.h> # include <openssl/asn1.h> # include <openssl/safestack.h> - -# 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 - -#ifdef __cplusplus +# include <openssl/rsa.h> +# include <openssl/dsa.h> +# include <openssl/dh.h> +# ifdef __cplusplus extern "C" { -#endif +# endif # ifdef WIN32 /* Under Win32 this is defined in wincrypt.h */ @@ -697,8 +688,9 @@ void ERR_load_TS_strings(void); # define TS_R_VAR_LOOKUP_FAILURE 136 # define TS_R_WRONG_CONTENT_TYPE 114 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif -#endif +# endif +# endif + #endif |