summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-01-11 09:45:11 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2009-01-11 09:45:11 (GMT)
commite97637daaa66b699c6d59b5ea91f40659d23dc66 (patch)
treeb90370cf7df8486b71712f176e7aa86ad52ccd47
parenta9b54c78d7d56a87e748e685b07f4cf9a060746c (diff)
downloadcpython-e97637daaa66b699c6d59b5ea91f40659d23dc66.zip
cpython-e97637daaa66b699c6d59b5ea91f40659d23dc66.tar.gz
cpython-e97637daaa66b699c6d59b5ea91f40659d23dc66.tar.bz2
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. ........
-rw-r--r--Misc/NEWS2
-rw-r--r--PC/pyconfig.h6
2 files changed, 8 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 4d78c7e..42637dd 100644
--- 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 06d22a3..d110476 100644
--- 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.