Author: Brian Kearns <[email protected]>
Branch:
Changeset: r60592:6e3f502b3be7
Date: 2013-01-28 04:16 -0500
http://bitbucket.org/pypy/pypy/changeset/6e3f502b3be7/
Log: fix the backported py3k thread_nt.c
diff --git a/rpython/translator/c/src/thread_nt.c
b/rpython/translator/c/src/thread_nt.c
--- a/rpython/translator/c/src/thread_nt.c
+++ b/rpython/translator/c/src/thread_nt.c
@@ -112,7 +112,7 @@
mutex->sem = NULL ; /* Just in case */
}
-DWORD EnterNonRecursiveMutex(PNRMUTEX mutex, BOOL wait)
+DWORD EnterNonRecursiveMutex(PNRMUTEX mutex, DWORD milliseconds)
{
return WaitForSingleObject(mutex->sem, milliseconds);
}
@@ -151,8 +151,8 @@
{
/* Fow now, intr_flag does nothing on Windows, and lock acquires are
* uninterruptible. */
- PyLockStatus success;
- PY_TIMEOUT_T milliseconds;
+ RPyLockStatus success;
+ RPY_TIMEOUT_T milliseconds;
if (microseconds >= 0) {
milliseconds = microseconds / 1000;
@@ -167,10 +167,10 @@
if (lock && EnterNonRecursiveMutex(
lock, (DWORD)milliseconds) == WAIT_OBJECT_0) {
- success = PY_LOCK_ACQUIRED;
+ success = RPY_LOCK_ACQUIRED;
}
else {
- success = PY_LOCK_FAILURE;
+ success = RPY_LOCK_FAILURE;
}
return success;
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
