comparison Python/pythonrun.c @ 49819:630c174b465e

Merged revisions 67295,67301-67302,67318,67330,67342-67343 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r67295 | benjamin.peterson | 2008-11-20 05:05:12 +0100 (jeu., 20 nov. 2008) | 1 line move useful sys.settrace information to the function's documentation from the debugger ........ r67301 | benjamin.peterson | 2008-11-20 22:25:31 +0100 (jeu., 20 nov. 2008) | 1 line fix indentation and a sphinx warning ........ r67302 | benjamin.peterson | 2008-11-20 22:44:23 +0100 (jeu., 20 nov. 2008) | 1 line oops! didn't mean to disable that test ........ r67318 | amaury.forgeotdarc | 2008-11-21 23:05:48 +0100 (ven., 21 nov. 2008) | 4 lines #4363: Let uuid.uuid1() and uuid.uuid4() run even if the ctypes module is not present. Will backport to 2.6 ........ r67330 | georg.brandl | 2008-11-22 09:34:14 +0100 (sam., 22 nov. 2008) | 2 lines #4364: fix attribute name on ctypes object. ........ r67342 | amaury.forgeotdarc | 2008-11-22 20:39:38 +0100 (sam., 22 nov. 2008) | 3 lines yuvconvert.c is a part of the "sv" module, an old IRIX thing and certainly not useful for any Windows build. ........ r67343 | amaury.forgeotdarc | 2008-11-22 21:01:18 +0100 (sam., 22 nov. 2008) | 5 lines #3996: On Windows, PyOS_CheckStack is supposed to protect the interpreter from stack overflow. But doing this, it always crashes when the stack is nearly full. Reviewed by Martin von Loewis. Will backport to 2.6. ........
author Amaury Forgeot d'Arc <amauryfa@gmail.com>
date Sat, 22 Nov 2008 22:18:04 +0000
parents f3234e43e1fe
children fbf7f53f4888
comparison
equal deleted inserted replaced
49815:030a15369eac 49819:630c174b465e
2037 return 0; 2037 return 0;
2038 } __except (GetExceptionCode() == STATUS_STACK_OVERFLOW ? 2038 } __except (GetExceptionCode() == STATUS_STACK_OVERFLOW ?
2039 EXCEPTION_EXECUTE_HANDLER : 2039 EXCEPTION_EXECUTE_HANDLER :
2040 EXCEPTION_CONTINUE_SEARCH) { 2040 EXCEPTION_CONTINUE_SEARCH) {
2041 int errcode = _resetstkoflw(); 2041 int errcode = _resetstkoflw();
2042 if (errcode) 2042 if (errcode == 0)
2043 { 2043 {
2044 Py_FatalError("Could not reset the stack!"); 2044 Py_FatalError("Could not reset the stack!");
2045 } 2045 }
2046 } 2046 }
2047 return 1; 2047 return 1;