From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 2 Oct 2005 12:26:06 +0000 (+0000)
Subject: Make OPENSSL_NO_COMP work on Win32.
X-Git-Tag: OpenSSL_0_9_8a~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=416b6fd1150a897b7bf4fd93a09cd03e21b546a4;p=oweals%2Fopenssl.git

Make OPENSSL_NO_COMP work on Win32.
---

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 10a5293b05..c93c5063ab 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -678,7 +678,6 @@ bad:
 			ERR_print_errors_fp(stderr);
 			}
 		}
-#endif
 	ssl_comp_methods = SSL_COMP_get_compression_methods();
 	fprintf(stderr, "Available compression methods:\n");
 	{
@@ -692,6 +691,7 @@ bad:
 			fprintf(stderr, "  %d: %s\n", c->id, c->name);
 			}
 	}
+#endif
 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 	if (ssl2)
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index ea61cb6c32..ff668375a0 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -954,6 +954,7 @@ sub read_options
 				}
 			}
 		}
+	elsif (/^no-comp$/) { $xcflags = "-DOPENSSL_NO_COMP $xcflags"; }
 	elsif (/^enable-zlib$/) { $xcflags = "-DZLIB $xcflags"; }
 	elsif (/^enable-zlib-dynamic$/)
 		{