[pypy-commit] pypy default: merge default

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r55208:c6d48bfb9d2f
Date: 2012-05-29 18:58 +0200
http://bitbucket.org/pypy/pypy/changeset/c6d48bfb9d2f/

Log:	merge default

diff --git a/pypy/rlib/rwin32.py b/pypy/rlib/rwin32.py
--- a/pypy/rlib/rwin32.py
+++ b/pypy/rlib/rwin32.py
@@ -371,7 +371,7 @@
         if sig == CTRL_C_EVENT or sig == CTRL_BREAK_EVENT:
             if GenerateConsoleCtrlEvent(sig, pid) == 0:
                 raise lastWindowsError('os_kill failed generating event')
-            return 0
+            return
         handle = OpenProcess(PROCESS_ALL_ACCESS, False, pid)
         if handle == NULL_HANDLE:
             raise lastWindowsError('os_kill failed opening process')