Author: Christian Tismer <tis...@stackless.com>
Branch: win64-stage1
Changeset: r50145:62684a5c6304
Date: 2011-12-04 20:33 +0100
http://bitbucket.org/pypy/pypy/changeset/62684a5c6304/
Log: merge default
diff --git a/pypy/module/_multiprocessing/interp_connection.py
b/pypy/module/_multiprocessing/interp_connection.py
--- a/pypy/module/_multiprocessing/interp_connection.py
+++ b/pypy/module/_multiprocessing/interp_connection.py
@@ -473,7 +473,7 @@
block = timeout < 0
if not block:
# XXX does not check for overflow
- deadline = _GetTickCount() + int(1000 * timeout + 0.5)
+ deadline = intmask(_GetTickCount()) + int(1000 * timeout + 0.5)
else:
deadline = 0
@@ -497,7 +497,7 @@
return True
if not block:
- now = _GetTickCount()
+ now = intmask(_GetTickCount())
if now > deadline:
return False
diff = deadline - now
diff --git a/pypy/rlib/_rsocket_rffi.py b/pypy/rlib/_rsocket_rffi.py
--- a/pypy/rlib/_rsocket_rffi.py
+++ b/pypy/rlib/_rsocket_rffi.py
@@ -418,7 +418,7 @@
if _MSVC:
def invalid_socket(fd):
return fd == INVALID_SOCKET
- INVALID_SOCKET = cConfig.INVALID_SOCKET
+ INVALID_SOCKET = intmask(cConfig.INVALID_SOCKET)
else:
def invalid_socket(fd):
return fd < 0
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
