From: Georg Brandl <georg@python.org>
Date: Sat, 3 Jan 2009 23:59:36 +0000 (+0000)
Subject: Merged revisions 68178 via svnmerge from
X-Git-Tag: v3.0.1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e2b6c9fca6d767a415d401a73c09bdc156db0c4;p=thirdparty%2FPython%2Fcpython.git

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
  ........
................
---

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index a3cce33bed71..c5f7e23adcf6 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>