]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merged revisions 68178 via svnmerge from
authorGeorg Brandl <georg@python.org>
Sat, 3 Jan 2009 23:59:36 +0000 (23:59 +0000)
committerGeorg Brandl <georg@python.org>
Sat, 3 Jan 2009 23:59:36 +0000 (23:59 +0000)
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

index a3cce33bed71de12511ac7048e6f7b955a77cb3f..c5f7e23adcf6e8ab737b38ef0d4972fafef1f9e3 100644 (file)
@@ -23,7 +23,9 @@
 #include <signal.h>
 #endif
 
+#ifdef MS_WINDOWS
 #include "malloc.h" /* for alloca */
+#endif
 
 #ifdef HAVE_LANGINFO_H
 #include <locale.h>