From 0e2b6c9fca6d767a415d401a73c09bdc156db0c4 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 3 Jan 2009 23:59:36 +0000 Subject: 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 ........ ................ --- Python/pythonrun.c | 2 ++ 1 file changed, 2 insertions(+) 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 #endif +#ifdef MS_WINDOWS #include "malloc.h" /* for alloca */ +#endif #ifdef HAVE_LANGINFO_H #include -- cgit v0.12