summaryrefslogtreecommitdiffstats
path: root/Modules/python.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-11-12 22:04:43 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-11-12 22:04:43 (GMT)
commitfc93ec5966f67b94cd46c3b8ab6400a54f3443ac (patch)
treee12a6ddccd266f6ca3e23cb2374f5cbd7dd0f744 /Modules/python.c
parentc7a8a210d614fbab47595bc88876c0365105e99a (diff)
parente262377cabc59f0c7d574ce608b61f692601608b (diff)
downloadcpython-fc93ec5966f67b94cd46c3b8ab6400a54f3443ac.zip
cpython-fc93ec5966f67b94cd46c3b8ab6400a54f3443ac.tar.gz
cpython-fc93ec5966f67b94cd46c3b8ab6400a54f3443ac.tar.bz2
merge heads
Diffstat (limited to 'Modules/python.c')
-rw-r--r--Modules/python.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/Modules/python.c b/Modules/python.c
index c70bf37..2c08b96 100644
--- a/Modules/python.c
+++ b/Modules/python.c
@@ -15,10 +15,6 @@ wmain(int argc, wchar_t **argv)
}
#else
-#ifdef __APPLE__
-extern wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size);
-#endif
-
int
main(int argc, char **argv)
{
@@ -45,11 +41,7 @@ main(int argc, char **argv)
oldloc = strdup(setlocale(LC_ALL, NULL));
setlocale(LC_ALL, "");
for (i = 0; i < argc; i++) {
-#ifdef __APPLE__
- argv_copy[i] = _Py_DecodeUTF8_surrogateescape(argv[i], strlen(argv[i]));
-#else
argv_copy[i] = _Py_char2wchar(argv[i], NULL);
-#endif
if (!argv_copy[i]) {
free(oldloc);
fprintf(stderr, "Fatal Python error: "