[pypy-commit] pypy py3.6: merge default into branch

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r96358:f774aae69691
Date: 2019-03-27 09:38 +0200
http://bitbucket.org/pypy/pypy/changeset/f774aae69691/

Log:	merge default into branch

diff --git a/rpython/rlib/rwin32.py b/rpython/rlib/rwin32.py
--- a/rpython/rlib/rwin32.py
+++ b/rpython/rlib/rwin32.py
@@ -261,7 +261,7 @@
                 132: 13, 145: 41, 158: 13, 161: 2, 164: 11, 167: 13, 183: 17,
                 188: 8, 189: 8, 190: 8, 191: 8, 192: 8, 193: 8, 194: 8,
                 195: 8, 196: 8, 197: 8, 198: 8, 199: 8, 200: 8, 201: 8,
-                202: 8, 206: 2, 215: 11, 232: 32, 267: 20, 1816: 12,
+                202: 8, 206: 2, 215: 11, 232: 32, 267: 20, 1816: 12, 1225: 111,
                 }
         return errors, errno.EINVAL