Changes by Mark Hammond for Windows CE. Mostly of the form

  #ifdef DONT_HAVE_header_H ... #endif around #include <header.h>.

diff --git a/Python/ceval.c b/Python/ceval.c
index ef5bced21195cd7e6be884f38fc7634e2b7d6a45..621839790fb6364032a70486ff9bc56a85a292c2 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -108,7 +108,9 @@ static long dxp[256];
 
 #ifdef WITH_THREAD
 
+#ifndef DONT_HAVE_ERRNO_H
 #include <errno.h>
+#endif
 #include "pythread.h"
 
 extern int _PyThread_Started; /* Flag for Py_Exit */

diff --git a/Python/import.c b/Python/import.c
index 936cbda06dd45b58d4d40d69bbed8936922093ab..851fd069306aec0eb940af6c5e2c0cb13cf35840 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -55,8 +55,12 @@ PERFORMANCE OF THIS SOFTWARE.
 #ifndef DONT_HAVE_STAT
 #define HAVE_STAT
 
+#ifndef DONT_HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifndef DONT_HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
 
 #if defined(PYCC_VACPP)
 /* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */

diff --git a/Python/mystrtoul.c b/Python/mystrtoul.c
index b5ea751068be2c514a179d2869683f7abbeb9d71..ac70e44ba71309da34ec86981a8f53b02d7e1e42 100644 (file)
--- a/Python/mystrtoul.c
+++ b/Python/mystrtoul.c
@@ -60,7 +60,9 @@ PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <ctype.h>
+#ifndef DONT_HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 unsigned long
 PyOS_strtoul(str, ptr, base)

diff --git a/Python/strtod.c b/Python/strtod.c
index 1c475e5ca35001bfd8bd9944d1354c65ea133802..a0991d5c687e95375d62167059d956315c6c2b78 100644 (file)
--- a/Python/strtod.c
+++ b/Python/strtod.c
@@ -54,7 +54,9 @@ static        double  HUGE            = 1.7976931348623157e308;
 
 extern double  atof();         /* Only called when result known to be ok */
 
+#ifndef DONT_HAVE_ERRNO_H
 #include <errno.h>
+#endif
 extern int     errno;
 
 double strtod(str, ptr)

diff --git a/Python/thread.c b/Python/thread.c
index c533398a3cdfd5909180de0607083e0122ff09e7..0f46223499ccbe379211188514f5c814af159cb1 100644 (file)
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -42,13 +42,17 @@ PERFORMANCE OF THIS SOFTWARE.
 #define DL_IMPORT(RTYPE) RTYPE
 #endif
 
+#ifndef DONT_HAVE_STDIO_H
 #include <stdio.h>
+#endif
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #else
+#ifdef Py_DEBUG
 extern char *getenv();
 #endif
+#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -162,6 +166,10 @@ void PyThread_init_thread _P0()
 #include "thread_beos.h"
 #endif
 
+#ifdef WINCE_THREADS
+#include "thread_wince.h"
+#endif
+
 /*
 #ifdef FOOBAR_THREADS
 #include "thread_foobar.h"