From: Gregory P. Smith <greg@mad-scientist.com>
Date: Wed, 13 Oct 2010 03:53:21 +0000 (+0000)
Subject: Fix compile on NetBSD 5.0 (or anything else using an old 0.9.9-dev OpenSSL).
X-Git-Tag: v3.2a4~641
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd4dacb3f983cb839314a79ef92430e83f757f17;p=thirdparty%2FPython%2Fcpython.git

Fix compile on NetBSD 5.0 (or anything else using an old 0.9.9-dev OpenSSL).
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 254dde69eb2e..4f7bb4d50ded 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -113,8 +113,10 @@ static unsigned int _ssl_locks_count = 0;
 # undef HAVE_OPENSSL_RAND
 #endif
 
-/* SSL_CTX_clear_options() and SSL_clear_options() were first added in OpenSSL 0.9.8m */
-#if OPENSSL_VERSION_NUMBER >= 0x009080dfL
+/* SSL_CTX_clear_options() and SSL_clear_options() were first added in
+ * OpenSSL 0.9.8m but do not appear in some 0.9.9-dev versions such the
+ * 0.9.9 from "May 2008" that NetBSD 5.0 uses. */
+#if OPENSSL_VERSION_NUMBER >= 0x009080dfL && OPENSSL_VERSION_NUMBER != 0x00909000L
 # define HAVE_SSL_CTX_CLEAR_OPTIONS
 #else
 # undef HAVE_SSL_CTX_CLEAR_OPTIONS