[pypy-svn] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r43629:6e2d6a60898c
Date: 2011-04-26 16:46 +0200
http://bitbucket.org/pypy/pypy/changeset/6e2d6a60898c/

Log:	merge heads

diff --git a/pypy/translator/c/src/debug_print.c b/pypy/translator/c/src/debug_print.c
--- a/pypy/translator/c/src/debug_print.c
+++ b/pypy/translator/c/src/debug_print.c
@@ -4,7 +4,12 @@
 #include <stdlib.h>
 
 #include <stdio.h>
+#ifndef _WIN32
 #include <unistd.h>
+#else
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
 #include "src/profiling.h"
 #include "src/debug_print.h"
 
@@ -21,7 +26,7 @@
 {
   char *filename = getenv("PYPYLOG");
   if (filename)
-#ifndef MS_WINDOWS
+#ifndef _WIN32
     unsetenv("PYPYLOG");   /* don't pass it to subprocesses */
 #else
     putenv("PYPYLOG=");    /* don't pass it to subprocesses */