Make OPENSSL_NO_COMP work under Win32.

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 4f7ec37f875778730f052c9337076bec8b0fec8e..5f74c51b38907fb83f9496f4d35e329d66e92d62 100644 (file)
--- 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 ea61cb6c32253f7c1bcb93cdfd689725abf68f58..ff668375a02c525e08378bc5b20c4f5f79ac2160 100755 (executable)
--- 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$/)
                {