From 0e8bd7e1ccf7f47bc0bb920af899c77669016d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 10 Jun 2006 12:23:46 +0000
Subject: Patch #1495999: Part two of Windows CE changes. - update header
 checks, using autoconf - provide dummies for getenv, environ, and GetVersion
 - adjust MSC_VER check in socketmodule.c

---
 Python/ceval.c       | 2 +-
 Python/dynload_win.c | 2 ++
 Python/mystrtoul.c   | 2 +-
 Python/pythonrun.c   | 2 ++
 Python/strtod.c      | 2 +-
 Python/thread_nt.h   | 2 ++
 6 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'Python')

diff --git a/Python/ceval.c b/Python/ceval.c
index 4d20431e6c..e68dbb24c2 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -205,7 +205,7 @@ PyEval_GetCallStats(PyObject *self)
 
 #ifdef WITH_THREAD
 
-#ifndef DONT_HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
 #include "pythread.h"
diff --git a/Python/dynload_win.c b/Python/dynload_win.c
index 36746e2f10..37d6d2ee38 100644
--- a/Python/dynload_win.c
+++ b/Python/dynload_win.c
@@ -2,7 +2,9 @@
 /* Support for dynamic loading of extension modules */
 
 #include <windows.h>
+#ifdef HAVE_DIRECT_H
 #include <direct.h>
+#endif
 #include <ctype.h>
 
 #include "Python.h"
diff --git a/Python/mystrtoul.c b/Python/mystrtoul.c
index 380b37da90..1fc360be95 100644
--- a/Python/mystrtoul.c
+++ b/Python/mystrtoul.c
@@ -17,7 +17,7 @@
 
 
 #include <ctype.h>
-#ifndef DONT_HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
 
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 3a282e7867..7e5c696a2c 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -17,7 +17,9 @@
 #include "eval.h"
 #include "marshal.h"
 
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 
 #ifdef HAVE_LANGINFO_H
 #include <locale.h>
diff --git a/Python/strtod.c b/Python/strtod.c
index 7911a94590..5c084a4de0 100644
--- a/Python/strtod.c
+++ b/Python/strtod.c
@@ -54,7 +54,7 @@ static	double	HUGE		= 1.7976931348623157e308;
 
 extern	double	atof(const char *);		/* Only called when result known to be ok */
 
-#ifndef DONT_HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
 extern	int	errno;
diff --git a/Python/thread_nt.h b/Python/thread_nt.h
index 0b7e84ece1..4dc6d6c313 100644
--- a/Python/thread_nt.h
+++ b/Python/thread_nt.h
@@ -5,7 +5,9 @@
 
 #include <windows.h>
 #include <limits.h>
+#ifdef HAVE_PROCESS_H
 #include <process.h>
+#endif
 
 typedef struct NRMUTEX {
 	LONG   owned ;
-- 
cgit v1.2.1