Merged revisions 68527 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68527 | martin.v.loewis | 2009-01-11 10:43:55 +0100 (So, 11 Jan 2009) | 2 lines

  Issue #4895: Use _strdup on Windows CE.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 4d78c7ed5ae10e50eb0f6f9c8516c8f53aa2f8a7..42637ddf5c4db6df23da59ef42a8c664dbc06373 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -248,6 +248,8 @@ Tools/Demos
 Build
 -----
 
+- Issue #4895: Use _strdup on Windows CE.
+
 - Issue #4472: "configure --enable-shared" now works on OSX
 
 - Issues #4728 and #4060: WORDS_BIGEDIAN is now correct in Universal builds.

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 06d22a344df6ac66d56a1aea81f1e2d7f9e63dee..d1104763f8787d796b7c1bdb9de769ffd729466a 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -88,6 +88,12 @@ WIN32 is still required for the locale module.
 #define USE_SOCKET
 #endif
 
+/* CE6 doesn't have strdup() but _strdup(). Assume the same for earlier versions. */
+#if defined(MS_WINCE)
+#  include <stdlib.h>
+#  define strdup _strdup
+#endif
+
 #ifdef MS_WINCE
 /* Python uses GetVersion() to distinguish between
  * Windows NT and 9x/ME where OS Unicode support is concerned.