summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-01-02 21:24:04 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-01-02 21:24:04 (GMT)
commit80a50acbe9de08730124bf557e042be1829d0838 (patch)
tree112a9cf10f1b1917bfb829a64c006c90bf57b126 /Python
parent5c88d8178442af4d2ac9f42774bc9ab4c45e5751 (diff)
downloadcpython-80a50acbe9de08730124bf557e042be1829d0838.zip
cpython-80a50acbe9de08730124bf557e042be1829d0838.tar.gz
cpython-80a50acbe9de08730124bf557e042be1829d0838.tar.bz2
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')
-rw-r--r--Python/pythonrun.c2
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>