[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r46514:9c5a0899fff6
Date: 2011-08-15 10:53 +0200
http://bitbucket.org/pypy/pypy/changeset/9c5a0899fff6/

Log:	merge heads

diff --git a/pypy/module/thread/ll_thread.py b/pypy/module/thread/ll_thread.py
--- a/pypy/module/thread/ll_thread.py
+++ b/pypy/module/thread/ll_thread.py
@@ -158,8 +158,8 @@
     return ll_lock
 
 def free_ll_lock(ll_lock):
-    c_thread_acquirelock_NOAUTO(ll_lock, 0)
-    c_thread_releaselock_NOAUTO(ll_lock)
+    acquire_NOAUTO(ll_lock, False)
+    release_NOAUTO(ll_lock)
     c_thread_lock_dealloc_NOAUTO(ll_lock)
     lltype.free(ll_lock, flavor='raw', track_allocation=False)