Author: Matti Picus <[email protected]>
Branch:
Changeset: r88195:a6977031946c
Date: 2016-11-07 21:45 +0200
http://bitbucket.org/pypy/pypy/changeset/a6977031946c/
Log: trivial fixes for win32/MSVC
diff --git a/pypy/module/_file/test/test_file.py
b/pypy/module/_file/test/test_file.py
--- a/pypy/module/_file/test/test_file.py
+++ b/pypy/module/_file/test/test_file.py
@@ -323,7 +323,7 @@
# the stacktrace
f = open(self.temppath, 'w')
f.close()
- co = compile('open("%s")' % self.temppath, self.temppath, 'exec')
+ co = compile('open(r"%s")' % self.temppath, self.temppath, 'exec')
sys.pypy_set_track_resources(True)
try:
# this exec used to fail, because space.format_traceback tried to
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -2315,7 +2315,7 @@
_pipe2_syscall = ENoSysCache()
-post_include_bits=['int _cpu_count(void);']
+post_include_bits=['RPY_EXTERN int _cpu_count(void);']
# cpu count for linux, windows and mac (+ bsds)
# note that the code is copied from cpython and split up here
if sys.platform.startswith('linux'):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
