Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r92136:02ab6e8e42e8
Date: 2017-08-12 20:35 +0200
http://bitbucket.org/pypy/pypy/changeset/02ab6e8e42e8/
Log: hg merge default
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -73,6 +73,8 @@
if "_cppyy" in working_modules:
working_modules.remove("_cppyy") # not tested on win32
+ if "_vmprof" in working_modules:
+ working_modules.remove("_vmprof") # FIXME: missing details
# The _locale module is needed by site.py on Windows
default_modules.add("_locale")
diff --git a/rpython/translator/c/src/signals.c
b/rpython/translator/c/src/signals.c
--- a/rpython/translator/c/src/signals.c
+++ b/rpython/translator/c/src/signals.c
@@ -74,6 +74,7 @@
}
#ifdef _WIN32
+#include <Windows.h>
#define atomic_cas(ptr, oldv, newv) (InterlockedCompareExchange(ptr, \
newv, oldv) == (oldv))
#else
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
