[pypy-svn] r72238 - pypy/trunk/pypy/module/_ssl

afa at codespeak.net afa at codespeak.net
Mon Mar 15 13:18:29 CET 2010


Author: afa
Date: Mon Mar 15 13:18:28 2010
New Revision: 72238

Modified:
   pypy/trunk/pypy/module/_ssl/interp_ssl.py
Log:
Compilation fails sometimes on Windows when openssl/ssl.h is included before other libraries.

This is Yet Another Winsock.h Mess, which separate compilation will probably solve.


Modified: pypy/trunk/pypy/module/_ssl/interp_ssl.py
==============================================================================
--- pypy/trunk/pypy/module/_ssl/interp_ssl.py	(original)
+++ pypy/trunk/pypy/module/_ssl/interp_ssl.py	Mon Mar 15 13:18:28 2010
@@ -13,13 +13,19 @@
 
 if sys.platform == 'win32' and platform.name != 'mingw32':
     libraries = ['libeay32', 'ssleay32', 'user32', 'advapi32', 'gdi32']
+    includes = [
+        # ssl.h includes winsock.h, which will conflict with our own
+        # need of winsock2.  Remove this when separate compilation is
+        # available...
+        'winsock2.h',
+        'openssl/ssl.h']
 else:
     libraries = ['ssl', 'crypto']
+    includes = ['openssl/ssl.h']
 
 eci = ExternalCompilationInfo(
     libraries = libraries,
-    includes = ['openssl/ssl.h',
-                ],
+    includes = includes,
     export_symbols = ['SSL_load_error_strings'],
     )
 



More information about the Pypy-commit mailing list