diff options
| author | Georg Brandl <georg@python.org> | 2009-01-03 23:59:36 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-01-03 23:59:36 (GMT) |
| commit | 0e2b6c9fca6d767a415d401a73c09bdc156db0c4 (patch) | |
| tree | a66a821f7dd5af52cd0e3cfe5d4d1755dddb4ce0 /Python/pythonrun.c | |
| parent | 88006d78902191b407a616033b369a5fc1717af1 (diff) | |
| download | cpython-0e2b6c9fca6d767a415d401a73c09bdc156db0c4.zip cpython-0e2b6c9fca6d767a415d401a73c09bdc156db0c4.tar.gz cpython-0e2b6c9fca6d767a415d401a73c09bdc156db0c4.tar.bz2 | |
Merged revisions 68178 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r68178 | benjamin.peterson | 2009-01-02 22:24:04 +0100 (Fri, 02 Jan 2009) | 9 lines
Merged revisions 68174 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68174 | benjamin.peterson | 2009-01-02 14:47:27 -0600 (Fri, 02 Jan 2009) | 1 line
fix compilation on non-Windows platforms
........
................
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index a3cce33..c5f7e23 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -23,7 +23,9 @@ #include <signal.h> #endif +#ifdef MS_WINDOWS #include "malloc.h" /* for alloca */ +#endif #ifdef HAVE_LANGINFO_H #include <locale.h> |