[pypy-commit] pypy jit-codewriter-force-cast-refactor: merged upstream.

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: jit-codewriter-force-cast-refactor
Changeset: r46840:f30d53ff177a
Date: 2011-08-27 21:34 -0400
http://bitbucket.org/pypy/pypy/changeset/f30d53ff177a/

Log:	merged upstream.

diff --git a/pypy/rpython/module/ll_os.py b/pypy/rpython/module/ll_os.py
--- a/pypy/rpython/module/ll_os.py
+++ b/pypy/rpython/module/ll_os.py
@@ -383,7 +383,7 @@
         return extdef([int, int], s_None, llimpl=dup2_llimpl,
                       export_name="ll_os.ll_os_dup2")
 
-    @registering(os.getlogin, condition=not _WIN32)
+    @registering_if(os, "getlogin", condition=not _WIN32)
     def register_os_getlogin(self):
         os_getlogin = self.llexternal('getlogin', [], rffi.CCHARP)