[Python-checkins] r68271 - in python/branches/release30-maint: Python/pythonrun.c

[georg.brandl]

Author: georg.brandl
Date: Sun Jan  4 00:59:36 2009
New Revision: 68271

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


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Python/pythonrun.c

Modified: python/branches/release30-maint/Python/pythonrun.c
==============================================================================
--- python/branches/release30-maint/Python/pythonrun.c	(original)
+++ python/branches/release30-maint/Python/pythonrun.c	Sun Jan  4 00:59:36 2009
@@ -23,7 +23,9 @@
 #include <signal.h>
 #endif
 
+#ifdef MS_WINDOWS
 #include "malloc.h" /* for alloca */
+#endif
 
 #ifdef HAVE_LANGINFO_H
 #include <locale.h>