[pypy-commit] pypy default: Blind fix for Windows

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r92346:4484e0986b55
Date: 2017-09-07 23:08 +0200
http://bitbucket.org/pypy/pypy/changeset/4484e0986b55/

Log:    Blind fix for Windows

diff --git a/rpython/rlib/_rsocket_rffi.py b/rpython/rlib/_rsocket_rffi.py
--- a/rpython/rlib/_rsocket_rffi.py
+++ b/rpython/rlib/_rsocket_rffi.py
@@ -985,11 +985,14 @@
                          ]
 
 
-    compilation_info = ExternalCompilationInfo(
+    compilation_info = eci.merge(ExternalCompilationInfo(
                                     includes=includes,
                                     
separate_module_sources=separate_module_sources,
                                     post_include_bits=post_include_bits,
-                               )
+                               ))
+else:
+    compilation_info = eci
+
 
 if _WIN32:
     CConfig.WSAEVENT = platform.SimpleType('WSAEVENT', rffi.VOIDP)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit