aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/comp
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-03-17 12:55:02 +0000
committerMatt Caswell <matt@openssl.org>2016-03-18 12:17:06 +0000
commitf16080718e4756ac1269c90f837263c5cd8dc412 (patch)
tree5436d59c7c5d4c75118fa6ef31b422f5908c5154 /crypto/comp
parent4275ee389b4092363ed8f2f2fa8aa0240b0ea122 (diff)
downloadopenssl-f16080718e4756ac1269c90f837263c5cd8dc412.tar.gz
Fix the no-comp option for Windows
no-comp on Windows was not actually suppressing compilation of the code, although it was suppressing its use. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit a6406c95984a1009f5676bbcf60cc0d6db107af4)
Diffstat (limited to 'crypto/comp')
-rw-r--r--crypto/comp/comp.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/comp/comp.h b/crypto/comp/comp.h
index 406c428aae..60a073404e 100644
--- a/crypto/comp/comp.h
+++ b/crypto/comp/comp.h
@@ -4,6 +4,10 @@
# include <openssl/crypto.h>
+# ifdef OPENSSL_NO_COMP
+# error COMP is disabled.
+# endif
+
#ifdef __cplusplus
extern "C" {
#endif