diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-17 11:50:23 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-18 12:09:27 +0000 |
| commit | 114de5b59502e1764c14082e14f07562ad4e6a15 (patch) | |
| tree | 87fe1abb8d2ff7c4c061faeb95a2b80c1d568d02 /include | |
| parent | bb4cc75b1ea8fb85ed9299dd6d5124eec686359c (diff) | |
Ensure that no-comp functions are flagged as such
mkdef.pl was not detecting no-comp functions. This updates the header file
so that mkdef.pl detects that no-comp applies, and the functions are marked
accordingly.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/comp.h | 4 | ||||
| -rw-r--r-- | include/openssl/ssl.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/openssl/comp.h b/include/openssl/comp.h index c7d903fc24..de16a9fcdb 100644 --- a/include/openssl/comp.h +++ b/include/openssl/comp.h @@ -58,6 +58,10 @@ # include <openssl/crypto.h> +# ifdef OPENSSL_NO_COMP +# error COMP is disabled. +# endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index d7a6586015..92e0274aaa 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -145,7 +145,9 @@ # include <openssl/e_os2.h> # include <openssl/opensslconf.h> +#ifndef OPENSSL_NO_COMP # include <openssl/comp.h> +#endif # include <openssl/bio.h> # if OPENSSL_API_COMPAT < 0x10100000L # include <openssl/x509.h> |