[Python-checkins] r85407 - python/branches/py3k/Modules/_ssl.c

[gregory.p.smith]

Author: gregory.p.smith
Date: Wed Oct 13 05:53:21 2010
New Revision: 85407

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


Modified:
   python/branches/py3k/Modules/_ssl.c

Modified: python/branches/py3k/Modules/_ssl.c
==============================================================================
--- python/branches/py3k/Modules/_ssl.c	(original)
+++ python/branches/py3k/Modules/_ssl.c	Wed Oct 13 05:53:21 2010
@@ -113,8 +113,10 @@
 # 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